Merge remote-tracking branch 'origin/master' into beta

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Lorow 2025-01-10 00:28:58 +01:00
commit fbaeb21bb1
6 changed files with 38 additions and 18 deletions

View File

@ -3,23 +3,20 @@
[![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) [![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 > All notable changes to this project will be documented in this file
## [2.5.0-beta.1](https://github.com/EyeTrackVR/OpenIris/compare/v2.4.0...v2.5.0-beta.1) (2024-06-21) ## [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)
### 🍕 Features ### 🍕 Features
* Add support for ov5640 cameras ([14d2cb0](https://github.com/EyeTrackVR/OpenIris/commit/14d2cb0858cd65452f2ce1cee9a3a1f68d8f7f51))
* Fix ov5640 support implementation after beta cleanup ([4894c22](https://github.com/EyeTrackVR/OpenIris/commit/4894c2205864d5a7d52e37c81b14ff7dc46517d4))
* fix usb streaming on wroom boards, add support for babble custom board ([049b160](https://github.com/EyeTrackVR/OpenIris/commit/049b16078ec5c07042652f2de3545ea6b69de6a9))
* Move logging in serial streaming so that we at least attempt to get new frame ([53a3d4b](https://github.com/EyeTrackVR/OpenIris/commit/53a3d4bcd603e2fd07546621628e69de88e4139a))
* Refactor commands and serial manager to support updated commands payload ([811a9f8](https://github.com/EyeTrackVR/OpenIris/commit/811a9f898a3f1bdb1e20ffd6f0d6e77a4533f52c))
* Release 2.5.0 ([81cda52](https://github.com/EyeTrackVR/OpenIris/commit/81cda523bb14fe81f8a910a4e23b417a6fd36d2f)) * Release 2.5.0 ([81cda52](https://github.com/EyeTrackVR/OpenIris/commit/81cda523bb14fe81f8a910a4e23b417a6fd36d2f))
### 🐛 Bug Fixes
* serial output for esp32cams and other boards not supporting higher frequency baud rate ([01e5e28](https://github.com/EyeTrackVR/OpenIris/commit/01e5e280ad26d2709231fe6aa2a96d1991cbf360))
## [2.5.0-beta.1](https://github.com/EyeTrackVR/OpenIris/compare/v2.4.0...v2.5.0-beta.1) (2024-06-11) ## [2.5.0-beta.1](https://github.com/EyeTrackVR/OpenIris/compare/v2.4.0...v2.5.0-beta.1) (2024-06-11)

View File

@ -5,7 +5,7 @@
platform = https://github.com/platformio/platform-espressif32.git platform = https://github.com/platformio/platform-espressif32.git
framework = arduino framework = arduino
monitor_speed = 115200 monitor_speed = 115200
custom_firmware_version = 2.5.0 custom_firmware_version = 2.6.0
monitor_rts = 0 monitor_rts = 0
monitor_dtr = 0 monitor_dtr = 0
monitor_filters = monitor_filters =

View File

@ -263,9 +263,9 @@ build_flags =
pwdn_gpio_num = -1 pwdn_gpio_num = -1
reset_gpio_num = -1 reset_gpio_num = -1
xclk_gpio_num = 4 xclk_gpio_num = 4
siod_gpio_num = 14 siod_gpio_num = 48
sioc_gpio_num = 13 sioc_gpio_num = 47
y9_gpio_num = 39 y9_gpio_num = 13
y8_gpio_num = 5 y8_gpio_num = 5
y7_gpio_num = 6 y7_gpio_num = 6
y6_gpio_num = 15 y6_gpio_num = 15
@ -273,11 +273,12 @@ y5_gpio_num = 17
y4_gpio_num = 8 y4_gpio_num = 8
y3_gpio_num = 18 y3_gpio_num = 18
y2_gpio_num = 16 y2_gpio_num = 16
vsync_gpio_num = 9 vsync_gpio_num = 21
href_gpio_num = 10 href_gpio_num = 14
pclk_gpio_num = 7 pclk_gpio_num = 7
build_flags = build_flags =
'-DCAMERA_MODULE_NAME="SWROOM_BABBLE_S3"' '-DCAMERA_MODULE_NAME="SWROOM_BABBLE_S3"'
-DCONFIG_CAMERA_MODULE_SWROOM_BABBLE_S3=1
-DPWDN_GPIO_NUM=${pinoutSWROOMBABBLES3.PWDN_GPIO_NUM} -DPWDN_GPIO_NUM=${pinoutSWROOMBABBLES3.PWDN_GPIO_NUM}
-DRESET_GPIO_NUM=${pinoutSWROOMBABBLES3.RESET_GPIO_NUM} -DRESET_GPIO_NUM=${pinoutSWROOMBABBLES3.RESET_GPIO_NUM}
-DXCLK_GPIO_NUM=${pinoutSWROOMBABBLES3.XCLK_GPIO_NUM} -DXCLK_GPIO_NUM=${pinoutSWROOMBABBLES3.XCLK_GPIO_NUM}

View File

@ -20,7 +20,7 @@
"include": "/lib/src" "include": "/lib/src"
}, },
"dependencies": {}, "dependencies": {},
"version": "2.5.0", "version": "2.6.0",
"frameworks": "arduino", "frameworks": "arduino",
"platforms": "espressif32" "platforms": "espressif32"
} }

View File

@ -77,18 +77,25 @@ void Network_Utilities::checkWiFiState()
{ {
case wl_status_t::WL_IDLE_STATUS: case wl_status_t::WL_IDLE_STATUS:
wifiStateManager.setState(WiFiState_e::WiFiState_Idle); wifiStateManager.setState(WiFiState_e::WiFiState_Idle);
break;
case wl_status_t::WL_NO_SSID_AVAIL: case wl_status_t::WL_NO_SSID_AVAIL:
wifiStateManager.setState(WiFiState_e::WiFiState_Error); wifiStateManager.setState(WiFiState_e::WiFiState_Error);
break;
case wl_status_t::WL_SCAN_COMPLETED: case wl_status_t::WL_SCAN_COMPLETED:
wifiStateManager.setState(WiFiState_e::WiFiState_None); wifiStateManager.setState(WiFiState_e::WiFiState_None);
break;
case wl_status_t::WL_CONNECTED: case wl_status_t::WL_CONNECTED:
wifiStateManager.setState(WiFiState_e::WiFiState_Connected); wifiStateManager.setState(WiFiState_e::WiFiState_Connected);
break;
case wl_status_t::WL_CONNECT_FAILED: case wl_status_t::WL_CONNECT_FAILED:
wifiStateManager.setState(WiFiState_e::WiFiState_Error); wifiStateManager.setState(WiFiState_e::WiFiState_Error);
break;
case wl_status_t::WL_CONNECTION_LOST: case wl_status_t::WL_CONNECTION_LOST:
wifiStateManager.setState(WiFiState_e::WiFiState_Disconnected); wifiStateManager.setState(WiFiState_e::WiFiState_Disconnected);
break;
case wl_status_t::WL_DISCONNECTED: case wl_status_t::WL_DISCONNECTED:
wifiStateManager.setState(WiFiState_e::WiFiState_Disconnected); wifiStateManager.setState(WiFiState_e::WiFiState_Disconnected);
break;
default: default:
wifiStateManager.setState(WiFiState_e::WiFiState_Disconnected); wifiStateManager.setState(WiFiState_e::WiFiState_Disconnected);
} }

View File

@ -11,6 +11,10 @@ SerialManager serialManager(&commandManager);
#ifdef CONFIG_CAMERA_MODULE_ESP32S3_XIAO_SENSE #ifdef CONFIG_CAMERA_MODULE_ESP32S3_XIAO_SENSE
LEDManager ledManager(LED_BUILTIN); LEDManager ledManager(LED_BUILTIN);
#elif CONFIG_CAMERA_MODULE_SWROOM_BABBLE_S3
LEDManager ledManager(38);
#else #else
LEDManager ledManager(33); LEDManager ledManager(33);
#endif // ESP32S3_XIAO_SENSE #endif // ESP32S3_XIAO_SENSE
@ -82,6 +86,17 @@ void setup() {
Logo::printASCII(); Logo::printASCII();
ledManager.begin(); 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 #ifndef SIM_ENABLED
deviceConfig.attach(cameraHandler); deviceConfig.attach(cameraHandler);
#endif // SIM_ENABLED #endif // SIM_ENABLED