From 40224d8875d5e666e5a86d681f4c3be249148605 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 21 Jun 2024 17:29:47 +0000 Subject: [PATCH 1/4] chore(minor): 2.5.0 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [2.5.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.4.0...v2.5.0) (2024-06-21) ### 🍕 Features * Release 2.5.0 ([81cda52](https://github.com/EyeTrackVR/OpenIris/commit/81cda523bb14fe81f8a910a4e23b417a6fd36d2f)) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61f19a1..cdab496 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) > All notable changes to this project will be documented in this file +## [2.5.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.4.0...v2.5.0) (2024-06-21) + + +### 🍕 Features + +* Release 2.5.0 ([81cda52](https://github.com/EyeTrackVR/OpenIris/commit/81cda523bb14fe81f8a910a4e23b417a6fd36d2f)) + ## [2.5.0-beta.1](https://github.com/EyeTrackVR/OpenIris/compare/v2.4.0...v2.5.0-beta.1) (2024-06-11) From a8c16039414d40a9bd12f9246219901b07141537 Mon Sep 17 00:00:00 2001 From: Rames The Generic Date: Sun, 14 Jul 2024 16:49:42 -0400 Subject: [PATCH 2/4] feat: Update Babble Board Pinout and Enable Emitters (#74) --- ESP/ini/pinouts.ini | 11 ++++++----- ESP/src/main.cpp | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ESP/ini/pinouts.ini b/ESP/ini/pinouts.ini index 88267a1..82b58b5 100644 --- a/ESP/ini/pinouts.ini +++ b/ESP/ini/pinouts.ini @@ -263,9 +263,9 @@ build_flags = pwdn_gpio_num = -1 reset_gpio_num = -1 xclk_gpio_num = 4 -siod_gpio_num = 14 -sioc_gpio_num = 13 -y9_gpio_num = 39 +siod_gpio_num = 48 +sioc_gpio_num = 47 +y9_gpio_num = 13 y8_gpio_num = 5 y7_gpio_num = 6 y6_gpio_num = 15 @@ -273,11 +273,12 @@ y5_gpio_num = 17 y4_gpio_num = 8 y3_gpio_num = 18 y2_gpio_num = 16 -vsync_gpio_num = 9 -href_gpio_num = 10 +vsync_gpio_num = 21 +href_gpio_num = 14 pclk_gpio_num = 7 build_flags = '-DCAMERA_MODULE_NAME="SWROOM_BABBLE_S3"' + -DCONFIG_CAMERA_MODULE_SWROOM_BABBLE_S3=1 -DPWDN_GPIO_NUM=${pinoutSWROOMBABBLES3.PWDN_GPIO_NUM} -DRESET_GPIO_NUM=${pinoutSWROOMBABBLES3.RESET_GPIO_NUM} -DXCLK_GPIO_NUM=${pinoutSWROOMBABBLES3.XCLK_GPIO_NUM} diff --git a/ESP/src/main.cpp b/ESP/src/main.cpp index 881539b..db05ca3 100644 --- a/ESP/src/main.cpp +++ b/ESP/src/main.cpp @@ -11,6 +11,10 @@ SerialManager serialManager(&commandManager); #ifdef CONFIG_CAMERA_MODULE_ESP32S3_XIAO_SENSE LEDManager ledManager(LED_BUILTIN); + +#elif CONFIG_CAMERA_MODULE_SWROOM_BABBLE_S3 +LEDManager ledManager(38); + #else LEDManager ledManager(33); #endif // ESP32S3_XIAO_SENSE @@ -82,6 +86,17 @@ void setup() { Logo::printASCII(); ledManager.begin(); + #ifdef CONFIG_CAMERA_MODULE_SWROOM_BABBLE_S3 // Set IR emitter strength to 100%. + const int ledPin = 1; // Replace this with a command endpoint eventually. + const int freq = 5000; + const int ledChannel = 0; + const int resolution = 8; + const int dutyCycle = 255; + ledcSetup(ledChannel, freq, resolution); + ledcAttachPin(1, ledChannel); + ledcWrite(ledChannel, dutyCycle); + #endif + #ifndef SIM_ENABLED deviceConfig.attach(cameraHandler); #endif // SIM_ENABLED From d3c402525c6ea82f619a001d0f01509e97b6d851 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 14 Jul 2024 20:53:57 +0000 Subject: [PATCH 3/4] chore(minor): 2.6.0 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [2.6.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.5.0...v2.6.0) (2024-07-14) ### 🍕 Features * Update Babble Board Pinout and Enable Emitters ([#74](https://github.com/EyeTrackVR/OpenIris/issues/74)) ([a8c1603](https://github.com/EyeTrackVR/OpenIris/commit/a8c16039414d40a9bd12f9246219901b07141537)) --- CHANGELOG.md | 7 +++++++ ESP/ini/dev_config.ini | 2 +- ESP/lib/library.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdab496..db93df2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) > All notable changes to this project will be documented in this file +## [2.6.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.5.0...v2.6.0) (2024-07-14) + + +### 🍕 Features + +* Update Babble Board Pinout and Enable Emitters ([#74](https://github.com/EyeTrackVR/OpenIris/issues/74)) ([a8c1603](https://github.com/EyeTrackVR/OpenIris/commit/a8c16039414d40a9bd12f9246219901b07141537)) + ## [2.5.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.4.0...v2.5.0) (2024-06-21) diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index aa542da..e028ff0 100644 --- a/ESP/ini/dev_config.ini +++ b/ESP/ini/dev_config.ini @@ -5,7 +5,7 @@ platform = https://github.com/platformio/platform-espressif32.git framework = arduino monitor_speed = 115200 -custom_firmware_version = 2.5.0 +custom_firmware_version = 2.6.0 monitor_rts = 0 monitor_dtr = 0 monitor_filters = diff --git a/ESP/lib/library.json b/ESP/lib/library.json index 8067761..53b99d3 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "2.5.0", + "version": "2.6.0", "frameworks": "arduino", "platforms": "espressif32" } From 62ef362ecf6587a16b15b9f0b127b1f10514e682 Mon Sep 17 00:00:00 2001 From: Kamilake Date: Tue, 10 Sep 2024 02:44:56 +0900 Subject: [PATCH 4/4] Update network_utilities.cpp (#77) Fix implicit fallthrough warning in checkWiFiState switch statement --- ESP/lib/src/data/utilities/network_utilities.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ESP/lib/src/data/utilities/network_utilities.cpp b/ESP/lib/src/data/utilities/network_utilities.cpp index f89f861..1bc0647 100644 --- a/ESP/lib/src/data/utilities/network_utilities.cpp +++ b/ESP/lib/src/data/utilities/network_utilities.cpp @@ -77,18 +77,25 @@ void Network_Utilities::checkWiFiState() { case wl_status_t::WL_IDLE_STATUS: wifiStateManager.setState(WiFiState_e::WiFiState_Idle); + break; case wl_status_t::WL_NO_SSID_AVAIL: wifiStateManager.setState(WiFiState_e::WiFiState_Error); + break; case wl_status_t::WL_SCAN_COMPLETED: wifiStateManager.setState(WiFiState_e::WiFiState_None); + break; case wl_status_t::WL_CONNECTED: wifiStateManager.setState(WiFiState_e::WiFiState_Connected); + break; case wl_status_t::WL_CONNECT_FAILED: wifiStateManager.setState(WiFiState_e::WiFiState_Error); + break; case wl_status_t::WL_CONNECTION_LOST: wifiStateManager.setState(WiFiState_e::WiFiState_Disconnected); + break; case wl_status_t::WL_DISCONNECTED: wifiStateManager.setState(WiFiState_e::WiFiState_Disconnected); + break; default: wifiStateManager.setState(WiFiState_e::WiFiState_Disconnected); }