From c7aef8457eb68fef6713daaf81c6eb23491d9ec7 Mon Sep 17 00:00:00 2001 From: Lorow Date: Sun, 12 Jan 2025 20:29:40 +0100 Subject: [PATCH 01/12] feat: Release 2.7.0 (#83) Add better support for Babble, make resolution easier to select via ini files configuration --------- Co-authored-by: Rames The Generic Co-authored-by: m-RNA <41933749+m-RNA@users.noreply.github.com> --- .github/workflows/build_release_bins.yml | 12 +++--- CHANGELOG.md | 23 +++++++++++ ESP/ini/boards.ini | 44 +++++++++++++++++++++- ESP/ini/dev_config.ini | 3 +- ESP/ini/user_config.ini | 3 ++ ESP/lib/library.json | 2 +- ESP/lib/src/data/config/project_config.cpp | 5 ++- ESP/lib/src/io/camera/cameraHandler.cpp | 31 ++++++++++++++- 8 files changed, 109 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_release_bins.yml b/.github/workflows/build_release_bins.yml index fd414b7f..ba4e20cf 100644 --- a/.github/workflows/build_release_bins.yml +++ b/.github/workflows/build_release_bins.yml @@ -40,7 +40,7 @@ jobs: matrix: ${{fromJson(needs.setup.outputs.matrix)}} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Build OpenIris Firmware @@ -68,7 +68,7 @@ jobs: run: | echo "FIRMWARE_NAME=$(cat ESP/build/${{ matrix.target_name }}${{ matrix.target_build_type }}/firmware_name.txt)" >> $GITHUB_ENV - name: Archive Firmware Binaries - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.target_name }}${{ matrix.target_build_type }}-firmware #path: "./ESP/.pio/build/${{ matrix.target_name }}${{ matrix.target_build_type }}/${{ env.FIRMWARE_NAME }}.bin" @@ -80,17 +80,17 @@ jobs: needs: [build] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Create Directory run: mkdir -p build - name: Download Firmware Files - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: path: build/ - name: Setup node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 18 - run: npm install -g conventional-changelog-conventionalcommits@6 @@ -117,6 +117,6 @@ jobs: timeout-minutes: 10 steps: - name: "♻️ remove build artifacts" - uses: geekyeggo/delete-artifact@v1 + uses: geekyeggo/delete-artifact@v5 with: name: ${{ matrix.target_name }}${{ matrix.target_build_type }}-firmware diff --git a/CHANGELOG.md b/CHANGELOG.md index db93df25..9dc7e0e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,29 @@ [![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.7.0-beta.2](https://github.com/EyeTrackVR/OpenIris/compare/v2.7.0-beta.1...v2.7.0-beta.2) (2025-01-12) + + +### 🍕 Features + +* Add camera resolution configuration support ([#79](https://github.com/EyeTrackVR/OpenIris/issues/79)) ([5c76e01](https://github.com/EyeTrackVR/OpenIris/commit/5c76e01c5e466c8cc7ef4cd43e78a763af00c06e)) + +## [2.7.0-beta.1](https://github.com/EyeTrackVR/OpenIris/compare/v2.6.0...v2.7.0-beta.1) (2025-01-11) + + +### 🍕 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)) + + +### 🐛 Bug Fixes + +* serial output for esp32cams and other boards not supporting higher frequency baud rate ([01e5e28](https://github.com/EyeTrackVR/OpenIris/commit/01e5e280ad26d2709231fe6aa2a96d1991cbf360)) + ## [2.6.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.5.0...v2.6.0) (2024-07-14) diff --git a/ESP/ini/boards.ini b/ESP/ini/boards.ini index 8115cbf8..868b7fcc 100644 --- a/ESP/ini/boards.ini +++ b/ESP/ini/boards.ini @@ -190,7 +190,10 @@ upload_flags = --no-stub [env:Babble-wrooms-s3] board = esp32-s3-devkitc-1 -board_build.flash_mode = qio ; qio_qspi +board_upload.flashsize = "4MB" +board_upload.flash_size=4MB +board_upload.maximum_size = 4194304 +board_build.flash_mode = qio board_build.arduino.memory_type = qio_qspi build_type = debug build_flags = ${env.build_flags} @@ -200,9 +203,27 @@ build_flags = ${env.build_flags} ${pinoutSWROOMBABBLES3.build_flags} upload_flags = --no-stub +[env:Babble-wrooms-s3_release] +board = esp32-s3-devkitc-1 +board_upload.flashsize = "4MB" +board_upload.flash_size=4MB +board_upload.maximum_size = 4194304 +board_build.flash_mode = qio +board_build.arduino.memory_type = qio_qspi +build_type = debug +build_flags = ${env.build_flags} + -DCORE_DEBUG_LEVEL=1 + -DDEBUG_MODE=0 + -DSERIAL_MANAGER_USE_HIGHER_FREQUENCY + ${pinoutSWROOMBABBLES3.build_flags} +upload_flags = --no-stub + [env:Babble_USB-wrooms-s3] board = esp32-s3-devkitc-1 -board_build.flash_mode = qio ; qio_qspi +board_upload.flashsize = "4MB" +board_upload.flash_size=4MB +board_upload.maximum_size = 4194304 +board_build.flash_mode = qio board_build.arduino.memory_type = qio_qspi build_type = debug build_flags = ${env.build_flags} @@ -211,6 +232,25 @@ build_flags = ${env.build_flags} -DETVR_EYE_TRACKER_USB_API -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=1 + -DARDUINO_FLASH + -DSERIAL_MANAGER_USE_HIGHER_FREQUENCY + ${pinoutSWROOMBABBLES3.build_flags} +upload_flags = --no-stub + +[env:Babble_USB-wrooms-s3_release] +board = esp32-s3-devkitc-1 +board_upload.flashsize = "4MB" +board_upload.flash_size=4MB +board_upload.maximum_size = 4194304 +board_build.flash_mode = qio +board_build.arduino.memory_type = qio_qspi +build_type = debug +build_flags = ${env.build_flags} + -DCORE_DEBUG_LEVEL=1 + -DDEBUG_MODE=0 + -DETVR_EYE_TRACKER_USB_API + -DARDUINO_USB_MODE=1 + -DARDUINO_USB_CDC_ON_BOOT=1 -DSERIAL_MANAGER_USE_HIGHER_FREQUENCY ${pinoutSWROOMBABBLES3.build_flags} upload_flags = --no-stub diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index e028ff06..e338c40d 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.6.0 +custom_firmware_version = 2.7.0 monitor_rts = 0 monitor_dtr = 0 monitor_filters = @@ -46,6 +46,7 @@ build_flags = '-DOTA_PASSWORD=${ota.otapassword}' ; Set the OTA password '-DOTA_LOGIN=${ota.otalogin}' + '-DCAM_RESOLUTION=${cam.resolution}' -O2 ; optimize for speed -DASYNCWEBSERVER_REGEX ; enable regex in asyncwebserver diff --git a/ESP/ini/user_config.ini b/ESP/ini/user_config.ini index e91ed658..a67a540e 100644 --- a/ESP/ini/user_config.ini +++ b/ESP/ini/user_config.ini @@ -18,3 +18,6 @@ otapassword = "12345678" [development] serial_flush_enabled = 0 + +[cam] +resolution = FRAMESIZE_240X240 \ No newline at end of file diff --git a/ESP/lib/library.json b/ESP/lib/library.json index 53b99d39..991c6de2 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "2.6.0", + "version": "2.7.0", "frameworks": "arduino", "platforms": "espressif32" } diff --git a/ESP/lib/src/data/config/project_config.cpp b/ESP/lib/src/data/config/project_config.cpp index 9154b1ea..05ea095b 100644 --- a/ESP/lib/src/data/config/project_config.cpp +++ b/ESP/lib/src/data/config/project_config.cpp @@ -1,4 +1,5 @@ #include "project_config.hpp" +#include "sensor.h" ProjectConfig::ProjectConfig(const std::string& name, const std::string& mdnsName) @@ -53,7 +54,7 @@ void ProjectConfig::initConfig() { this->config.camera = { .vflip = 0, .href = 0, - .framesize = 4, + .framesize = (uint8_t)CAM_RESOLUTION, .quality = 7, .brightness = 2, }; @@ -200,7 +201,7 @@ void ProjectConfig::load() { /* Camera Config */ this->config.camera.vflip = getInt("vflip", 0); this->config.camera.href = getInt("href", 0); - this->config.camera.framesize = getInt("framesize", 4); + this->config.camera.framesize = getInt("framesize", (uint8_t)CAM_RESOLUTION); this->config.camera.quality = getInt("quality", 7); this->config.camera.brightness = getInt("brightness", 2); diff --git a/ESP/lib/src/io/camera/cameraHandler.cpp b/ESP/lib/src/io/camera/cameraHandler.cpp index 7b51bdb7..323b4e82 100644 --- a/ESP/lib/src/io/camera/cameraHandler.cpp +++ b/ESP/lib/src/io/camera/cameraHandler.cpp @@ -63,7 +63,7 @@ void CameraHandler::setupCameraPinout() { void CameraHandler::setupBasicResolution() { config.pixel_format = PIXFORMAT_JPEG; - config.frame_size = FRAMESIZE_240X240; + config.frame_size = CAM_RESOLUTION; if (!psramFound()) { log_e("[Camera]: Did not find psram, setting lower image quality"); @@ -108,6 +108,10 @@ void CameraHandler::setupCameraSensor() { camera_sensor->set_aec2(camera_sensor, 0); // 0 = disable , 1 = enable camera_sensor->set_ae_level(camera_sensor, 0); // -2 to 2 camera_sensor->set_aec_value(camera_sensor, 300); // 0 to 1200 + // Use a lower aec value for babble to better isolate the face with illuminators + #ifdef CONFIG_CAMERA_MODULE_SWROOM_BABBLE_S3 + camera_sensor->set_aec_value(camera_sensor, 100); // 0 to 1200 + #endif // controls the gain camera_sensor->set_gain_ctrl(camera_sensor, 0); // 0 = disable , 1 = enable @@ -195,7 +199,29 @@ void CameraHandler::loadConfigData() { log_d("Loading camera config data done"); } -int CameraHandler::setCameraResolution(framesize_t frameSize) { +#ifdef CONFIG_CAMERA_MODULE_SWROOM_BABBLE_S3 +int CameraHandler::setCameraResolution(framesize_t frameSize) { // For Babble, use a firmware crop as shown by Physdude + if (camera_sensor->pixformat == PIXFORMAT_JPEG) { + try { + int outputSize = 240; + + int baseRes = 2; //CIF + int ROIsize = 240; + int startPointX = 80; + int startPointY = 28; + + return camera_sensor->set_res_raw(camera_sensor, baseRes, 0, 0, 0, startPointX, startPointY, ROIsize, ROIsize, outputSize, outputSize, 0, 0); + + } catch (...) { + // they sent us a malformed or unsupported frameSize - rather than crash - + // tell them about it + return -1; + } + } + return -1; +} +#else +int CameraHandler::setCameraResolution(framesize_t frameSize) { // By default, use the standard method. if (camera_sensor->pixformat == PIXFORMAT_JPEG) { try { return camera_sensor->set_framesize(camera_sensor, frameSize); @@ -207,6 +233,7 @@ int CameraHandler::setCameraResolution(framesize_t frameSize) { } return -1; } +#endif int CameraHandler::setVFlip(int direction) { return camera_sensor->set_vflip(camera_sensor, direction); From 25f99ce449c86588fc72226634a80ac8eec1102e Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 12 Jan 2025 19:33:48 +0000 Subject: [PATCH 02/12] chore(minor): 2.7.0 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [2.7.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.6.0...v2.7.0) (2025-01-12) ### 🍕 Features * Release 2.7.0 ([#83](https://github.com/EyeTrackVR/OpenIris/issues/83)) ([c7aef84](https://github.com/EyeTrackVR/OpenIris/commit/c7aef8457eb68fef6713daaf81c6eb23491d9ec7)) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dc7e0e9..e9163018 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.7.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.6.0...v2.7.0) (2025-01-12) + + +### 🍕 Features + +* Release 2.7.0 ([#83](https://github.com/EyeTrackVR/OpenIris/issues/83)) ([c7aef84](https://github.com/EyeTrackVR/OpenIris/commit/c7aef8457eb68fef6713daaf81c6eb23491d9ec7)) + ## [2.7.0-beta.2](https://github.com/EyeTrackVR/OpenIris/compare/v2.7.0-beta.1...v2.7.0-beta.2) (2025-01-12) From f4608674978edf5728e495824ed615d9d45f85fd Mon Sep 17 00:00:00 2001 From: Lorow Date: Wed, 15 Jan 2025 09:41:26 +0100 Subject: [PATCH 03/12] feat: Fix typo in SerialManager (#84) --- ESP/lib/src/io/Serial/SerialManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ESP/lib/src/io/Serial/SerialManager.cpp b/ESP/lib/src/io/Serial/SerialManager.cpp index b065fd3f..b2ec122a 100644 --- a/ESP/lib/src/io/Serial/SerialManager.cpp +++ b/ESP/lib/src/io/Serial/SerialManager.cpp @@ -52,7 +52,7 @@ void SerialManager::send_frame() { #endif void SerialManager::init() { -#ifndef SERIAL_MANAGER_USE_HIGHER_FREQUENCY +#ifdef SERIAL_MANAGER_USE_HIGHER_FREQUENCY Serial.begin(3000000); #endif if (SERIAL_FLUSH_ENABLED) { From ebecc612925f844b60c6b4a25aa075eebdb476dc Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 15 Jan 2025 08:45:51 +0000 Subject: [PATCH 04/12] chore(minor): 2.8.0 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [2.8.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.7.0...v2.8.0) (2025-01-15) ### 🍕 Features * Fix typo in SerialManager ([#84](https://github.com/EyeTrackVR/OpenIris/issues/84)) ([f460867](https://github.com/EyeTrackVR/OpenIris/commit/f4608674978edf5728e495824ed615d9d45f85fd)) --- 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 e9163018..3db9b681 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.8.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.7.0...v2.8.0) (2025-01-15) + + +### 🍕 Features + +* Fix typo in SerialManager ([#84](https://github.com/EyeTrackVR/OpenIris/issues/84)) ([f460867](https://github.com/EyeTrackVR/OpenIris/commit/f4608674978edf5728e495824ed615d9d45f85fd)) + ## [2.7.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.6.0...v2.7.0) (2025-01-12) diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index e338c40d..236c83be 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.7.0 +custom_firmware_version = 2.8.0 monitor_rts = 0 monitor_dtr = 0 monitor_filters = diff --git a/ESP/lib/library.json b/ESP/lib/library.json index 991c6de2..7e91b703 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "2.7.0", + "version": "2.8.0", "frameworks": "arduino", "platforms": "espressif32" } From 42c33112972414cb5121b1052184fd0443de3164 Mon Sep 17 00:00:00 2001 From: Lorow Date: Tue, 28 Jan 2025 22:41:37 +0100 Subject: [PATCH 05/12] feat: Fix AsyncWebServer dependency (#85) * Fix AsyncWebServer dependency * Add -DARDUINO_USB_CDC_ON_BOOT=1 to wroom boards to fix wifi provisioning over serial --- ESP/ini/boards.ini | 8 ++- ESP/ini/dev_config.ini | 4 +- ESP/lib/src/network/api/baseAPI/baseAPI.cpp | 31 ++-------- ESP/lib/src/network/api/baseAPI/baseAPI.hpp | 64 +++++++++------------ 4 files changed, 41 insertions(+), 66 deletions(-) diff --git a/ESP/ini/boards.ini b/ESP/ini/boards.ini index 868b7fcc..68220fcd 100644 --- a/ESP/ini/boards.ini +++ b/ESP/ini/boards.ini @@ -103,6 +103,7 @@ build_type = debug build_flags = ${env.build_flags} -DCORE_DEBUG_LEVEL=4 -DDEBUG_MODE=1 + -DARDUINO_USB_CDC_ON_BOOT=1 -DSERIAL_MANAGER_USE_HIGHER_FREQUENCY ${pinoutsESPS3WROVER.build_flags} upload_flags = --no-stub @@ -114,6 +115,7 @@ build_type = release build_flags = ${env.build_flags} -DDEBUG_MODE=0 -DCORE_DEBUG_LEVEL=1 + -DARDUINO_USB_CDC_ON_BOOT=1 -DSERIAL_MANAGER_USE_HIGHER_FREQUENCY ${pinoutsESPS3WROVER.build_flags} upload_flags = --no-stub @@ -150,6 +152,7 @@ build_type = debug build_flags = ${env.build_flags} -DCORE_DEBUG_LEVEL=4 -DDEBUG_MODE=1 + -DARDUINO_USB_CDC_ON_BOOT=1 -DSERIAL_MANAGER_USE_HIGHER_FREQUENCY ${pinoutsESPS3WROOM.build_flags} @@ -159,6 +162,7 @@ build_type = release build_flags = ${env.build_flags} -DDEBUG_MODE=0 -DCORE_DEBUG_LEVEL=1 + -DARDUINO_USB_CDC_ON_BOOT=1 -DSERIAL_MANAGER_USE_HIGHER_FREQUENCY ${pinoutsESPS3WROOM.build_flags} @@ -199,6 +203,7 @@ build_type = debug build_flags = ${env.build_flags} -DCORE_DEBUG_LEVEL=4 -DDEBUG_MODE=1 + -DARDUINO_USB_CDC_ON_BOOT=1 -DSERIAL_MANAGER_USE_HIGHER_FREQUENCY ${pinoutSWROOMBABBLES3.build_flags} upload_flags = --no-stub @@ -214,6 +219,7 @@ build_type = debug build_flags = ${env.build_flags} -DCORE_DEBUG_LEVEL=1 -DDEBUG_MODE=0 + -DARDUINO_USB_CDC_ON_BOOT=1 -DSERIAL_MANAGER_USE_HIGHER_FREQUENCY ${pinoutSWROOMBABBLES3.build_flags} upload_flags = --no-stub @@ -261,8 +267,6 @@ build_type = debug build_flags = ${env.build_flags} -DCORE_DEBUG_LEVEL=4 -DDEBUG_MODE=1 - #-DARDUINO_USB_MODE=1 - #-DARDUINO_USB_CDC_ON_BOOT=1 -DSERIAL_MANAGER_USE_HIGHER_FREQUENCY ${pinoutsESPS3XIAOSENSE.build_flags} diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index 236c83be..bf3366c6 100644 --- a/ESP/ini/dev_config.ini +++ b/ESP/ini/dev_config.ini @@ -18,14 +18,14 @@ monitor_filters = esp32_exception_decoder board_build.partitions = min_spiffs.csv ;build_unflags = -Os ; disable optimization for size +lib_compat_mode = strict lib_ldf_mode = deep+ ;115200 is used for compatability - if you are on windows and want the code to flash faster use 921600 upload_speed = 921600 lib_deps = # https://github.com/espressif/esp32-camera esp32-camera - https://github.com/me-no-dev/ESPAsyncWebServer.git - https://github.com/me-no-dev/AsyncTCP.git + ESP32Async/ESPAsyncWebServer @ 3.6.0 https://github.com/bblanchon/ArduinoJson.git extra_scripts = pre:tools/customname.py diff --git a/ESP/lib/src/network/api/baseAPI/baseAPI.cpp b/ESP/lib/src/network/api/baseAPI/baseAPI.cpp index d3ce8087..d8461aed 100644 --- a/ESP/lib/src/network/api/baseAPI/baseAPI.cpp +++ b/ESP/lib/src/network/api/baseAPI/baseAPI.cpp @@ -1,13 +1,5 @@ #include "baseAPI.hpp" -//! These have to be called before the constructor of the class because they are -//! static C++ 11 does not have inline variables, sadly. So we have to do this. -// const char *BaseAPI::MIMETYPE_HTML{"text/html"}; -// const char *BaseAPI::MIMETYPE_CSS{"text/css"}; -// const char *BaseAPI::MIMETYPE_JS{"application/javascript"}; -// const char *BaseAPI::MIMETYPE_PNG{"image/png"}; -// const char *BaseAPI::MIMETYPE_JPG{"image/jpeg"}; -// const char *BaseAPI::MIMETYPE_ICO{"image/x-icon"}; const char* BaseAPI::MIMETYPE_JSON{"application/json"}; BaseAPI::BaseAPI(ProjectConfig& projectConfig, @@ -79,7 +71,7 @@ void BaseAPI::setWiFi(AsyncWebServerRequest* request) { log_d("Number of Params: %d", params); for (int i = 0; i < params; i++) { - AsyncWebParameter* param = request->getParam(i); + const AsyncWebParameter* param = request->getParam(i); if (param->name() == "networkName") { networkName.assign(param->value().c_str()); } else if (param->name() == "ssid") { @@ -102,17 +94,6 @@ void BaseAPI::setWiFi(AsyncWebServerRequest* request) { projectConfig.setWifiConfig(networkName, ssid, password, channel, power, adhoc, true); - /* if (WiFiStateManager->getCurrentState() == - WiFiState_e::WiFiState_ADHOC) - { - projectConfig.setAPWifiConfig(ssid, password, &channel, adhoc, - true); - } - else - { - - } */ - request->send(200, MIMETYPE_JSON, "{\"msg\":\"Done. Wifi Creds have been set.\"}"); break; @@ -178,7 +159,7 @@ void BaseAPI::setDeviceConfig(AsyncWebServerRequest* request) { int ota_port; for (int i = 0; i < params; i++) { - AsyncWebParameter* param = request->getParam(i); + const AsyncWebParameter* param = request->getParam(i); if (param->name() == "hostname") { std::string result = param->value().c_str(); @@ -216,7 +197,7 @@ void BaseAPI::setWiFiTXPower(AsyncWebServerRequest* request) { uint8_t txPower = 0; for (int i = 0; i < params; i++) { - AsyncWebParameter* param = request->getParam(i); + const AsyncWebParameter* param = request->getParam(i); if (param->name() == "txpower" || param->name() == "txPower") { txPower = atoi(param->value().c_str()); } @@ -275,7 +256,7 @@ void BaseAPI::setCamera(AsyncWebServerRequest* request) { //! be set in a specific order This means the order of the URL params does //! not matter for (int i = 0; i < params; i++) { - AsyncWebParameter* param = request->getParam(i); + const AsyncWebParameter* param = request->getParam(i); if (param->name() == "framesize") { temp_camera_framesize = (uint8_t)param->value().toInt(); } else if (param->name() == "vflip") { @@ -392,7 +373,6 @@ void BaseAPI::beginOTA() { "{\"id\": \"" + _id + "\", \"hardware\": \"ESP32\"}"); }); - // Note: HTT_GET server.on("/update", 0b00000001, [&](AsyncWebServerRequest* request) { log_d("[DEBUG] Free Heap: %d", ESP.getFreeHeap()); checkAuthentication(request, login, password); @@ -406,7 +386,8 @@ void BaseAPI::beginOTA() { response->addHeader("Content-Encoding", "gzip"); request->send(response); }); - // Note: HTT_POST + + // HTTP_POST server.on( "/update", 0b00000010, [&](AsyncWebServerRequest* request) { diff --git a/ESP/lib/src/network/api/baseAPI/baseAPI.hpp b/ESP/lib/src/network/api/baseAPI/baseAPI.hpp index 4b6a544c..0c3923b3 100644 --- a/ESP/lib/src/network/api/baseAPI/baseAPI.hpp +++ b/ESP/lib/src/network/api/baseAPI/baseAPI.hpp @@ -3,7 +3,6 @@ //! Warning do not format this file with clang-format or it will break the code -#include #include #include @@ -11,16 +10,14 @@ #define WEBSERVER_H -/* #define XHTTP_GET 0b00000001; -#define XHTTP_POST 0b00000010; -#define XHTTP_DELETE 0b00000100; -#define XHTTP_PUT 0b00001000; -#define XHTTP_PATCH 0b00010000; -#define XHTTP_HEAD 0b00100000; -#define XHTTP_OPTIONS 0b01000000; -#define XHTTP_ANY 0b01111111; */ +// hack, we have to include it JUST so the macro executes and defines HTTP_* +// methods cause it's beging included later in streamServer.hpp, but then the +// macro executes too late and tries to redefine the methods, failing. but if we +// don't include it here, then ESPAsyncWebServer fails to compile due to +// WEBSERVER_H which has to be set because if it isn't, ESPAsyncWebServer will +// define the methods and thus the circus continues +#include -// constexpr int HTTP_GET = 0b00000001; constexpr int HTTP_ANY = 0b01111111; #include @@ -28,18 +25,15 @@ constexpr int HTTP_ANY = 0b01111111; #include #include - #include #include #include "Hash.h" - -#include "data/utilities/network_utilities.hpp" -#include "tasks/tasks.hpp" - #include "data/StateManager/StateManager.hpp" #include "data/config/project_config.hpp" +#include "data/utilities/network_utilities.hpp" #include "elegantWebpage.h" #include "io/camera/cameraHandler.hpp" +#include "tasks/tasks.hpp" class BaseAPI { protected: @@ -47,11 +41,6 @@ class BaseAPI { bool _authRequired; static const char* MIMETYPE_HTML; - /* static const char *MIMETYPE_CSS; */ - /* static const char *MIMETYPE_JS; */ - /* static const char *MIMETYPE_PNG; */ - /* static const char *MIMETYPE_JPG; */ - /* static const char *MIMETYPE_ICO; */ static const char* MIMETYPE_JSON; protected: @@ -100,33 +89,34 @@ class BaseAPI { typedef std::unordered_map networkMethodsMap_t; - ProjectConfig &projectConfig; - /// @brief Local instance of the AsyncWebServer - so that we dont need to use new and delete - AsyncWebServer server; + ProjectConfig& projectConfig; + /// @brief Local instance of the AsyncWebServer - so that we dont need to use + /// new and delete + AsyncWebServer server; #ifndef SIM_ENABLED - CameraHandler &camera; + CameraHandler& camera; #endif // SIM_ENABLED -public : - BaseAPI(ProjectConfig& projectConfig, + public: + BaseAPI(ProjectConfig& projectConfig, #ifndef SIM_ENABLED - CameraHandler& camera, + CameraHandler& camera, #endif // SIM_ENABLED - const std::string& api_url, + const std::string& api_url, #ifndef SIM_ENABLED - int port = 81 + int port = 81 #else - int port = 80 + int port = 80 #endif ); - virtual ~BaseAPI(); - virtual void begin(); - void checkAuthentication(AsyncWebServerRequest* request, - const char* login, - const char* password); - void beginOTA(); - void notFound(AsyncWebServerRequest* request) const; + virtual ~BaseAPI(); + virtual void begin(); + void checkAuthentication(AsyncWebServerRequest* request, + const char* login, + const char* password); + void beginOTA(); + void notFound(AsyncWebServerRequest* request) const; }; #endif // BASEAPI_HPP From 8cb484c860fc1ae9f9bc238d83fe52bdfb40ccd1 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 28 Jan 2025 21:45:54 +0000 Subject: [PATCH 06/12] chore(minor): 2.9.0 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [2.9.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.8.0...v2.9.0) (2025-01-28) ### 🍕 Features * Fix AsyncWebServer dependency ([#85](https://github.com/EyeTrackVR/OpenIris/issues/85)) ([42c3311](https://github.com/EyeTrackVR/OpenIris/commit/42c33112972414cb5121b1052184fd0443de3164)) --- 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 3db9b681..110c1b68 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.9.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.8.0...v2.9.0) (2025-01-28) + + +### 🍕 Features + +* Fix AsyncWebServer dependency ([#85](https://github.com/EyeTrackVR/OpenIris/issues/85)) ([42c3311](https://github.com/EyeTrackVR/OpenIris/commit/42c33112972414cb5121b1052184fd0443de3164)) + ## [2.8.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.7.0...v2.8.0) (2025-01-15) diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index bf3366c6..98634191 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.8.0 +custom_firmware_version = 2.9.0 monitor_rts = 0 monitor_dtr = 0 monitor_filters = diff --git a/ESP/lib/library.json b/ESP/lib/library.json index 7e91b703..ccf0c93d 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "2.8.0", + "version": "2.9.0", "frameworks": "arduino", "platforms": "espressif32" } From 28a053d65323a4f48ad8de4992fe496ab3e63225 Mon Sep 17 00:00:00 2001 From: Lorow Date: Thu, 30 Jan 2025 11:33:44 +0100 Subject: [PATCH 07/12] fix: Add babble firmware to CI matrix (#86) --- .github/workflows/build_release_bins.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_release_bins.yml b/.github/workflows/build_release_bins.yml index ba4e20cf..3314e219 100644 --- a/.github/workflows/build_release_bins.yml +++ b/.github/workflows/build_release_bins.yml @@ -31,7 +31,7 @@ jobs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - id: set-matrix - run: echo "matrix={\"target_name\":[\"esp32AIThinker\",\"esp32M5Stack\",\"esp32Cam\",\"esp_eye\",\"wrover\",\"wrooms3QIO\",\"wrooms3QIOUSB\",\"wrooms3\",\"wrooms3USB\",\"xiaosenses3\",\"xiaosenses3_USB\"],\"target_build_type\":[\"\", \"_release\"]}" >> $GITHUB_OUTPUT + run: echo "matrix={\"target_name\":[\"esp32AIThinker\",\"esp32M5Stack\",\"esp32Cam\",\"esp_eye\",\"wrover\",\"wrooms3QIO\",\"wrooms3QIOUSB\",\"wrooms3\",\"wrooms3USB\",\"xiaosenses3\",\"xiaosenses3_USB\",\"Babble-wrooms-s3\",\"Babble_USB-wrooms-s3\"],\"target_build_type\":[\"\", \"_release\"]}" >> $GITHUB_OUTPUT build: needs: setup From 5da262c8daf27ea2cb060ec2e41a19a1c1c3db29 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 30 Jan 2025 10:38:01 +0000 Subject: [PATCH 08/12] chore(patch): 2.9.1 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [2.9.1](https://github.com/EyeTrackVR/OpenIris/compare/v2.9.0...v2.9.1) (2025-01-30) ### 🐛 Bug Fixes * Add babble firmware to CI matrix ([#86](https://github.com/EyeTrackVR/OpenIris/issues/86)) ([28a053d](https://github.com/EyeTrackVR/OpenIris/commit/28a053d65323a4f48ad8de4992fe496ab3e63225)) --- 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 110c1b68..63176385 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.9.1](https://github.com/EyeTrackVR/OpenIris/compare/v2.9.0...v2.9.1) (2025-01-30) + + +### 🐛 Bug Fixes + +* Add babble firmware to CI matrix ([#86](https://github.com/EyeTrackVR/OpenIris/issues/86)) ([28a053d](https://github.com/EyeTrackVR/OpenIris/commit/28a053d65323a4f48ad8de4992fe496ab3e63225)) + ## [2.9.0](https://github.com/EyeTrackVR/OpenIris/compare/v2.8.0...v2.9.0) (2025-01-28) diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index 98634191..c4b30af5 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.9.0 +custom_firmware_version = 2.9.1 monitor_rts = 0 monitor_dtr = 0 monitor_filters = diff --git a/ESP/lib/library.json b/ESP/lib/library.json index ccf0c93d..cfad1d53 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "2.9.0", + "version": "2.9.1", "frameworks": "arduino", "platforms": "espressif32" } From 3211f7cc860b5b5d3930f48443b7f7a8d01148d6 Mon Sep 17 00:00:00 2001 From: Lorow Date: Thu, 19 Jun 2025 20:16:12 +0200 Subject: [PATCH 09/12] Add initial support for the M5Stack camera F board --- ESP/ini/boards.ini | 16 ++++++++++++++++ ESP/ini/pinouts.ini | 37 +++++++++++++++++++++++++++++++++++++ ESP/src/main.cpp | 24 +++++++++++++----------- 3 files changed, 66 insertions(+), 11 deletions(-) diff --git a/ESP/ini/boards.ini b/ESP/ini/boards.ini index 68220fcd..7c4fb681 100644 --- a/ESP/ini/boards.ini +++ b/ESP/ini/boards.ini @@ -19,6 +19,22 @@ build_flags = ${env.build_flags} ; CAMERA PINOUT DEFINITIONS ${pinoutsAIThinker.build_flags} +[env:esp32M5Stack-Camera-F] +board = m5stack-timer-cam +build_type = debug +build_flags = ${env.build_flags} + -DDEBUG_MODE=1 + -DCORE_DEBUG_LEVEL=4 + ${pinoutsM5Stack_Camera_F.build_flags} + +[env:esp32M5Stack-Camera-F_release] +board = m5stack-timer-cam +build_type = release +build_flags = ${env.build_flags} + -DDEBUG_MODE=0 + -DCORE_DEBUG_LEVEL=1 + ${pinoutsM5Stack_Camera_F.build_flags} + [env:esp32M5Stack] board = esp32cam build_type = debug diff --git a/ESP/ini/pinouts.ini b/ESP/ini/pinouts.ini index 82b58b50..d406690d 100644 --- a/ESP/ini/pinouts.ini +++ b/ESP/ini/pinouts.ini @@ -1,6 +1,43 @@ #!! DO NOT CHANGE ANYTHING BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING # IF YOU ARE A USER DO NOT TOUCH THIS FILE +[pinoutsM5Stack_Camera_F] +pwdn_gpio_num = -1 +reset_gpio_num = 15 +xclk_gpio_num = 27 +siod_gpio_num = 25 +sioc_gpio_num = 23 +y9_gpio_num = 19 +y8_gpio_num = 36 +y7_gpio_num = 18 +y6_gpio_num = 39 +y5_gpio_num = 5 +y4_gpio_num = 34 +y3_gpio_num = 35 +y2_gpio_num = 32 +vsync_gpio_num = 22 +href_gpio_num = 26 +pclk_gpio_num = 21 +build_flags = + '-DCAMERA_MODULE_NAME="M5STACK_CAMERA_F"' + -DCONFIG_CAMERA_MODULE_M5STACK_CAMERA_F=1 + -DPWDN_GPIO_NUM=${pinoutsM5Stack_Camera_F.PWDN_GPIO_NUM} + -DRESET_GPIO_NUM=${pinoutsM5Stack_Camera_F.RESET_GPIO_NUM} + -DXCLK_GPIO_NUM=${pinoutsM5Stack_Camera_F.XCLK_GPIO_NUM} + -DSIOD_GPIO_NUM=${pinoutsM5Stack_Camera_F.SIOD_GPIO_NUM} + -DSIOC_GPIO_NUM=${pinoutsM5Stack_Camera_F.SIOC_GPIO_NUM} + -DY9_GPIO_NUM=${pinoutsM5Stack_Camera_F.Y9_GPIO_NUM} + -DY8_GPIO_NUM=${pinoutsM5Stack_Camera_F.Y8_GPIO_NUM} + -DY7_GPIO_NUM=${pinoutsM5Stack_Camera_F.Y7_GPIO_NUM} + -DY6_GPIO_NUM=${pinoutsM5Stack_Camera_F.Y6_GPIO_NUM} + -DY5_GPIO_NUM=${pinoutsM5Stack_Camera_F.Y5_GPIO_NUM} + -DY4_GPIO_NUM=${pinoutsM5Stack_Camera_F.Y4_GPIO_NUM} + -DY3_GPIO_NUM=${pinoutsM5Stack_Camera_F.Y3_GPIO_NUM} + -DY2_GPIO_NUM=${pinoutsM5Stack_Camera_F.Y2_GPIO_NUM} + -DVSYNC_GPIO_NUM=${pinoutsM5Stack_Camera_F.VSYNC_GPIO_NUM} + -DHREF_GPIO_NUM=${pinoutsM5Stack_Camera_F.HREF_GPIO_NUM} + -DPCLK_GPIO_NUM=${pinoutsM5Stack_Camera_F.PCLK_GPIO_NUM} + [pinoutsESPCAM_M5STACK] pwdn_gpio_num = -1 reset_gpio_num = 15 diff --git a/ESP/src/main.cpp b/ESP/src/main.cpp index db05ca32..a6707780 100644 --- a/ESP/src/main.cpp +++ b/ESP/src/main.cpp @@ -14,7 +14,8 @@ LEDManager ledManager(LED_BUILTIN); #elif CONFIG_CAMERA_MODULE_SWROOM_BABBLE_S3 LEDManager ledManager(38); - +#elif DCONFIG_CAMERA_MODULE_M5STACK_CAMERA_F +LEDManager ledManager(2); #else LEDManager ledManager(33); #endif // ESP32S3_XIAO_SENSE @@ -86,16 +87,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 +#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); From 5f8434a94492bb0ec30364596f5bdd94dde04495 Mon Sep 17 00:00:00 2001 From: Lorow Date: Thu, 19 Jun 2025 20:18:00 +0200 Subject: [PATCH 10/12] Add build support for esp32M5Stack-Camera-F in CI --- .github/workflows/build_release_bins.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_release_bins.yml b/.github/workflows/build_release_bins.yml index 3314e219..3c65c3a6 100644 --- a/.github/workflows/build_release_bins.yml +++ b/.github/workflows/build_release_bins.yml @@ -31,7 +31,7 @@ jobs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - id: set-matrix - run: echo "matrix={\"target_name\":[\"esp32AIThinker\",\"esp32M5Stack\",\"esp32Cam\",\"esp_eye\",\"wrover\",\"wrooms3QIO\",\"wrooms3QIOUSB\",\"wrooms3\",\"wrooms3USB\",\"xiaosenses3\",\"xiaosenses3_USB\",\"Babble-wrooms-s3\",\"Babble_USB-wrooms-s3\"],\"target_build_type\":[\"\", \"_release\"]}" >> $GITHUB_OUTPUT + run: echo "matrix={\"target_name\":[\"esp32AIThinker\",\"esp32M5Stack\",\"esp32M5Stack-Camera-F\"",\"esp32Cam\",\"esp_eye\",\"wrover\",\"wrooms3QIO\",\"wrooms3QIOUSB\",\"wrooms3\",\"wrooms3USB\",\"xiaosenses3\",\"xiaosenses3_USB\",\"Babble-wrooms-s3\",\"Babble_USB-wrooms-s3\"],\"target_build_type\":[\"\", \"_release\"]}" >> $GITHUB_OUTPUT build: needs: setup From 182a1e89f108a87cd89fcb9eb0d4e95a9fe06918 Mon Sep 17 00:00:00 2001 From: Lorow Date: Thu, 19 Jun 2025 20:22:12 +0200 Subject: [PATCH 11/12] Fix CI script --- .github/workflows/build_release_bins.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_release_bins.yml b/.github/workflows/build_release_bins.yml index 3c65c3a6..47879224 100644 --- a/.github/workflows/build_release_bins.yml +++ b/.github/workflows/build_release_bins.yml @@ -31,7 +31,7 @@ jobs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - id: set-matrix - run: echo "matrix={\"target_name\":[\"esp32AIThinker\",\"esp32M5Stack\",\"esp32M5Stack-Camera-F\"",\"esp32Cam\",\"esp_eye\",\"wrover\",\"wrooms3QIO\",\"wrooms3QIOUSB\",\"wrooms3\",\"wrooms3USB\",\"xiaosenses3\",\"xiaosenses3_USB\",\"Babble-wrooms-s3\",\"Babble_USB-wrooms-s3\"],\"target_build_type\":[\"\", \"_release\"]}" >> $GITHUB_OUTPUT + run: echo "matrix={\"target_name\":[\"esp32AIThinker\",\"esp32M5Stack\",\"esp32M5Stack-Camera-F\",\"esp32Cam\",\"esp_eye\",\"wrover\",\"wrooms3QIO\",\"wrooms3QIOUSB\",\"wrooms3\",\"wrooms3USB\",\"xiaosenses3\",\"xiaosenses3_USB\",\"Babble-wrooms-s3\",\"Babble_USB-wrooms-s3\"],\"target_build_type\":[\"\", \"_release\"]}" >> $GITHUB_OUTPUT build: needs: setup From cadabc0c29ef565d61c4c3cf276722351e1ee735 Mon Sep 17 00:00:00 2001 From: Lorow Date: Thu, 19 Jun 2025 20:27:56 +0200 Subject: [PATCH 12/12] Fix issues after merge conflict --- ESP/ini/boards.ini | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ESP/ini/boards.ini b/ESP/ini/boards.ini index a530b476..7c4fb681 100644 --- a/ESP/ini/boards.ini +++ b/ESP/ini/boards.ini @@ -240,21 +240,6 @@ build_flags = ${env.build_flags} ${pinoutSWROOMBABBLES3.build_flags} upload_flags = --no-stub -[env:Babble-wrooms-s3_release] -board = esp32-s3-devkitc-1 -board_upload.flashsize = "4MB" -board_upload.flash_size=4MB -board_upload.maximum_size = 4194304 -board_build.flash_mode = qio -board_build.arduino.memory_type = qio_qspi -build_type = debug -build_flags = ${env.build_flags} - -DCORE_DEBUG_LEVEL=1 - -DDEBUG_MODE=0 - -DSERIAL_MANAGER_USE_HIGHER_FREQUENCY - ${pinoutSWROOMBABBLES3.build_flags} -upload_flags = --no-stub - [env:Babble_USB-wrooms-s3] board = esp32-s3-devkitc-1 board_upload.flashsize = "4MB"