From 0809f6baba93be45ccc55f77556f96711e8b5d12 Mon Sep 17 00:00:00 2001 From: Rene Zeldenthuis Date: Sun, 17 Dec 2023 02:21:27 +0100 Subject: [PATCH] Updated platformio definitions --- .github/workflows/main.yml | 11 +- include/settings.h | 2 +- platformio.ini | 210 ++++--------------------------------- 3 files changed, 29 insertions(+), 194 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9b38fc0..23d0530 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,11 +6,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up python - uses: actions/setup-python@v3 with: - python-version: '3.x' - architecture: 'x64' + submodules: 'true' + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.9' - name: Install PlatformIO run: python -m pip install platformio - name: Build firmware @@ -18,5 +19,5 @@ jobs: - name: Archive uses: actions/upload-artifact@v3 with: - name: firmware.bin + name: firmwares.zip path: .pio/build/*/firmware.bin diff --git a/include/settings.h b/include/settings.h index 718ae47..f87f508 100644 --- a/include/settings.h +++ b/include/settings.h @@ -32,7 +32,7 @@ constexpr camera_config_t default_camera_config = wrover_kit_camera_settings; #elif defined(BOARD_SEEED_XIAO_ESP32S3_SENSE) constexpr const char *board_name = "Seed Xiao ESP32S3 Sense"; constexpr camera_config_t default_camera_config = xiao_esp32s3_camera_settings; -#elif +#else #error No board defined #endif diff --git a/platformio.ini b/platformio.ini index 153503a..0a025e2 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,9 +9,8 @@ ; https://docs.platformio.org/page/projectconf.html ############################################################################### -[env:esp32cam] +[env] platform = espressif32 -board = esp32cam framework = arduino #upload_protocol = espota @@ -28,218 +27,53 @@ monitor_filters = log2file, time, default, esp32_exception_decoder build_flags = -O2 - -D BOARD_ESP32CAM - -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE - -D LED_BUILTIN=33 - -mfix-esp32-psram-cache-issue - -D IOTWEBCONF_PASSWORD_LEN=64 + -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE + -DIOTWEBCONF_PASSWORD_LEN=64 board_build.embed_txtfiles = html/index.min.html lib_deps = - prampec/IotWebConf @ ^3.2.1 - geeksville/Micro-RTSP @ ^0.1.6 + prampec/IotWebConf@^3.2.1 + geeksville/Micro-RTSP@^0.1.6 rzeldent/micro-moustache@^1.0.1 -############################################################################### -[env:ai_thinker_esp32cam] -platform = espressif32 +[env:esp32cam] board = esp32cam -framework = arduino - -#upload_protocol = espota -#upload_port = 192.168.178.223 -#upload_flags = --auth='ESP32CAM-RTSP' - -# Partition scheme for OTA -board_build.partitions = min_spiffs.csv - -monitor_speed = 115200 -monitor_rts = 0 -monitor_dtr = 0 -monitor_filters = log2file, time, default, esp32_exception_decoder - build_flags = - -O2 - -D BOARD_AITHINKER_ESP32CAM - -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE - -D LED_BUILTIN=33 - -mfix-esp32-psram-cache-issue - -D IOTWEBCONF_PASSWORD_LEN=64 + -DBOARD_ESP32CAM + -DLED_BUILTIN=33 -board_build.embed_txtfiles = - html/index.min.html - -lib_deps = - prampec/IotWebConf @ ^3.2.1 - geeksville/Micro-RTSP @ ^0.1.6 - rzeldent/micro-moustache@^1.0.1 +[env:ai_thinker_esp32cam] +board = esp32cam +build_flags = + -DBOARD_AITHINKER_ESP32CAM + -DLED_BUILTIN=33 -############################################################################### [env:esp_eye] -platform = espressif32 board = esp32cam -framework = arduino - -#upload_protocol = espota -#upload_port = 192.168.178.223 -#upload_flags = --auth='ESP32CAM-RTSP' - -# Partition scheme for OTA -board_build.partitions = min_spiffs.csv - -monitor_speed = 115200 -monitor_rts = 0 -monitor_dtr = 0 -monitor_filters = log2file, time, default, esp32_exception_decoder - build_flags = - -O2 - -D BOARD_ESP_EYE - -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE - -D LED_BUILTIN=33 - -mfix-esp32-psram-cache-issue - -D IOTWEBCONF_PASSWORD_LEN=64 + -DBOARD_ESP_EYE + -DLED_BUILTIN=33 -board_build.embed_txtfiles = - html/index.min.html - -lib_deps = - prampec/IotWebConf @ ^3.2.1 - geeksville/Micro-RTSP @ ^0.1.6 - rzeldent/micro-moustache@^1.0.1 - -############################################################################### [env:ttgo_t_camera] -platform = espressif32 board = ttgo-t-beam -framework = arduino - -#upload_protocol = espota -#upload_port = 192.168.178.223 -#upload_flags = --auth='ESP32CAM-RTSP' - -# Partition scheme for OTA -board_build.partitions = min_spiffs.csv - -monitor_speed = 115200 -monitor_rts = 0 -monitor_dtr = 0 -monitor_filters = log2file, time, default, esp32_exception_decoder - build_flags = - -O2 - -D BOARD_TTGO_T_CAMERA - -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE - -mfix-esp32-psram-cache-issue - -D IOTWEBCONF_PASSWORD_LEN=64 + -DBOARD_TTGO_T_CAMERA -board_build.embed_txtfiles = - html/index.min.html - -lib_deps = - prampec/IotWebConf @ ^3.2.1 - geeksville/Micro-RTSP @ ^0.1.6 - rzeldent/micro-moustache@^1.0.1 - -############################################################################### [env:m5stack_esp32cam] -platform = espressif32 board = m5stack-core-esp32 -framework = arduino - -#upload_protocol = espota -#upload_port = 192.168.178.223 -#upload_flags = --auth='ESP32CAM-RTSP' - -# Partition scheme for OTA -board_build.partitions = min_spiffs.csv - -monitor_speed = 115200 -monitor_rts = 0 -monitor_dtr = 0 -monitor_filters = log2file, time, default, esp32_exception_decoder - build_flags = - -O2 - -D BOARD_M5STACK_ESP32CAM - -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE - -D LED_BUILTIN=33 - -mfix-esp32-psram-cache-issue - -D IOTWEBCONF_PASSWORD_LEN=64 + -DBOARD_M5STACK_ESP32CAM + -DLED_BUILTIN=33 -board_build.embed_txtfiles = - html/index.min.html - -lib_deps = - prampec/IotWebConf @ ^3.2.1 - geeksville/Micro-RTSP @ ^0.1.6 - rzeldent/micro-moustache@^1.0.1 - -############################################################################### [env:esp32_wrover_cam] -platform = espressif32 board = esp-wrover-kit -framework = arduino - -#upload_protocol = espota -#upload_port = 192.168.178.223 -#upload_flags = --auth='ESP32CAM-RTSP' - -# Partition scheme for OTA -board_build.partitions = min_spiffs.csv - -monitor_speed = 115200 -monitor_rts = 0 -monitor_dtr = 0 -monitor_filters = log2file, time, default, esp32_exception_decoder - build_flags = - -O2 - -D BOARD_ESP32_WROVER_CAM - -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE - -D LED_BUILTIN=2 - -mfix-esp32-psram-cache-issue - -D IOTWEBCONF_PASSWORD_LEN=64 - -board_build.embed_txtfiles = - html/index.min.html + -DBOARD_ESP32_WROVER_CAM + -DLED_BUILTIN=2 -lib_deps = - prampec/IotWebConf @ ^3.2.1 - geeksville/Micro-RTSP @ ^0.1.6 - rzeldent/micro-moustache@^1.0.1 - -############################################################################### [env:seeed_xiao_esp32s3] -platform = espressif32 board = seeed_xiao_esp32s3 -framework = arduino - -# Partition scheme for OTA -board_build.partitions = min_spiffs.csv - -#upload_protocol = espota -#upload_port = 192.168.178.223 -#upload_flags = --auth='ESP32CAM-RTSP' - -monitor_speed = 115200 -monitor_rts = 0 -monitor_dtr = 0 -monitor_filters = log2file, time, default, esp32_exception_decoder - -build_flags = - -O2 - -D BOARD_SEEED_XIAO_ESP32S3_SENSE - -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE - -mfix-esp32-psram-cache-issue - -D IOTWEBCONF_PASSWORD_LEN=64 - -board_build.embed_txtfiles = - html/index.min.html - -lib_deps = - prampec/IotWebConf @ ^3.2.1 - geeksville/Micro-RTSP @ ^0.1.6 - rzeldent/micro-moustache@^1.0.1 \ No newline at end of file +build_flags = + -D BOARD_SEEED_XIAO_ESP32S3_SENSE \ No newline at end of file