From 1bd742787fa76341894f5207be070f57b75eb0a7 Mon Sep 17 00:00:00 2001 From: Tyeth Gundry Date: Sat, 24 May 2025 19:38:58 +0100 Subject: [PATCH 01/21] Add ESP32-C5 DevKitC-1 --- platformio.ini | 62 ++++++++++++++++--- src/Wippersnapper_Boards.h | 6 ++ .../littlefs/WipperSnapper_LittleFS.cpp | 2 +- 3 files changed, 61 insertions(+), 9 deletions(-) diff --git a/platformio.ini b/platformio.ini index 4be3bb597..062dd2c82 100644 --- a/platformio.ini +++ b/platformio.ini @@ -101,9 +101,7 @@ lib_deps = ; Common build environment for ESP32 platform [common:esp32] -platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.13/platform-espressif32.zip -;;Funhouse uses 3.0.7 of arduino-esp32 for now: -; platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.07/platform-espressif32.zip +platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.30-alpha1/platform-espressif32.zip ; This is needed for occasional new features and bug fixes ; platform = https://github.com/pioarduino/platform-espressif32#develop lib_ignore = WiFiNINA, WiFi101, OneWire @@ -175,6 +173,28 @@ build_flags = board_build.filesystem = littlefs board_build.partitions = min_spiffs.csv +; Espressif ESP32-C5 8MB FLASH 2MB PSRAM ESP32-C5-DevKitC-1 +[env:espressif_esp32-c5-devkitc-1] +extends = common:esp32 +board = esp32-c5-devkitc-1 +build_type = debug +board_build.f_flash = 80000000L +build_flags = + -DARDUINO_ESPRESSIF_ESP32C5_DEVKITC_1 + -DARDUINO_ESP32C5_DEV + -DBOARD_HAS_PSRAM + -DDEBUG=1 + -DESP_LOG_LEVEL=5 + -DARDUINO_CORE_DEBUG_LEVEL=5 + -DARDUINO_DEBUG_LEVEL=5 + -DARDUINO_LOG_LEVEL=5 + -DCORE_DEBUG_LEVEL=5 + -DARDUHAL_LOG_LEVEL=5 +board_build.filesystem = littlefs +board_build.partitions = min_spiffs.csv + + + ; Espressif ESP32-C6 4MB NO PSRAM esp32-c6-devkitm-1 [env:espressif_esp32-c6-devkitm-1] extends = common:esp32 @@ -183,7 +203,6 @@ build_type = debug build_flags = -DARDUINO_ESPRESSIF_ESP32C6_DEVKITM_1 -DARDUINO_ADAFRUIT_FEATHER_ESP32C6 - -DNDEBUG=1 -DDEBUG=1 -DESP_LOG_LEVEL=5 -DARDUINO_CORE_DEBUG_LEVEL=5 @@ -194,6 +213,8 @@ build_flags = board_build.filesystem = littlefs board_build.partitions = min_spiffs.csv + + ; Adafruit Feather ESP32-S2 [env:featheresp32s2] extends = common:esp32 @@ -297,6 +318,35 @@ build_flags = -DARDUINO_FUNHOUSE -DBOARD_HAS_PSRAM board_build.partitions = tinyuf2-partitions-4MB-noota.csv extra_scripts = pre:rename_usb_config.py +; Adafruit Funhouse ESP32-S2 +[env:adafruit_funhouse_esp32s2_debug] +extends = common:esp32 +board = adafruit_funhouse_esp32s2 +;lib_extra_dirs = +build_type = debug +build_flags = + -DARDUINO_FUNHOUSE + -DBOARD_HAS_PSRAM + -DCFG_TUSB_DEBUG=1 + -DDEBUG=1 + -DESP_LOG_LEVEL=ESP_LOG_VERBOSE + -DARDUINO_CORE_DEBUG_LEVEL=5 + -DCORE_DEBUG_LEVEL=5 + -DARDUHAL_LOG_LEVEL=5 + ; USB Configuration + ; Uncomment if USB CDC on boot is needed + ; -DARDUINO_USB_CDC_ON_BOOT=1 + ; -DARDUINO_USB_MODE=0 ; 0 for CDC + TinyUSB, 1 for Hardware CDC + JTAG + ; LVGL Debugging + -DLV_USE_DEBUG=1 + -DLV_USE_LOG=1 + -DLV_LOG_PRINTF=1 + -DLV_LOG_COLOR=1 + -DLV_LOG_LEVEL=LV_LOG_LEVEL_TRACE +;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1 +board_build.partitions = tinyuf2-partitions-4MB-noota.csv +extra_scripts = pre:rename_usb_config.py + ; Adafruit QT Py ESP32 Pico [env:adafruit_qtpy_esp32] extends = common:esp32 @@ -374,7 +424,6 @@ build_flags = -DARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2 -DBOARD_HAS_PSRAM -DCFG_TUSB_DEBUG=1 - -DNDEBUG=1 -DDEBUG=1 -DESP_LOG_LEVEL=5 -DARDUINO_CORE_DEBUG_LEVEL=5 @@ -495,7 +544,6 @@ build_flags = -DUSE_TINYUSB -DARDUINO_USB_CDC_ON_BOOT=1 -DCFG_TUSB_DEBUG=1 -DDEBUG=1 - -DNDEBUG=1 -DUSE_AIRLIFT=1 -g ; -DUSBCON @@ -563,7 +611,6 @@ build_flags = -DDEBUG_RP2040_SPI -DDEBUG_RP2040_CORE -DDEBUG_RP2040_WIFI - -DNDEBUG -DLWIP_DEBUG=1 -DDEBUG_RP2040_PORT=Serial1 -DDEBUG_RP2040_UART_1 @@ -619,7 +666,6 @@ build_flags = ; -DDEBUG_RP2040_SPI ; -DDEBUG_RP2040_CORE ; -DDEBUG_RP2040_WIFI - ; -DNDEBUG ; -DLWIP_DEBUG ; -DDEBUG_RP2040_PORT=Serial1 ; -DDEBUG_RP2040_UART_1 diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h index 0c9363b7f..fdd81dd4c 100644 --- a/src/Wippersnapper_Boards.h +++ b/src/Wippersnapper_Boards.h @@ -171,6 +171,12 @@ #define USE_STATUS_NEOPIXEL #define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL #define STATUS_NEOPIXEL_NUM 1 +#elif defined(ARDUINO_ESP32C5_DEV) +#define BOARD_ID "feather-esp32c6" +#define USE_LITTLEFS +#define USE_STATUS_NEOPIXEL +#define STATUS_NEOPIXEL_PIN LED_BUILTIN +#define STATUS_NEOPIXEL_NUM 1 #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32_V2) #define BOARD_ID "feather-esp32-v2" #define USE_LITTLEFS diff --git a/src/provisioning/littlefs/WipperSnapper_LittleFS.cpp b/src/provisioning/littlefs/WipperSnapper_LittleFS.cpp index f07b46f38..5c58b8b22 100644 --- a/src/provisioning/littlefs/WipperSnapper_LittleFS.cpp +++ b/src/provisioning/littlefs/WipperSnapper_LittleFS.cpp @@ -21,7 +21,7 @@ defined(ARDUINO_SPARKLEMOTIONMINI_ESP32) || \ defined(ARDUINO_SPARKLEMOTIONSTICK_ESP32) || \ defined(ARDUINO_ADAFRUIT_QTPY_ESP32C3) || \ - defined(ARDUINO_ADAFRUIT_FEATHER_ESP32C6) + defined(ARDUINO_ADAFRUIT_FEATHER_ESP32C6) || defined(ARDUINO_ESP32C5_DEV) #include "WipperSnapper_LittleFS.h" /**************************************************************************/ From 88137640e7822fc4fcaf0844aa432843ccda8a5e Mon Sep 17 00:00:00 2001 From: tyeth Date: Fri, 20 Jun 2025 16:02:35 +0100 Subject: [PATCH 02/21] tweaks --- platformio.ini | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 062dd2c82..ead6efe84 100644 --- a/platformio.ini +++ b/platformio.ini @@ -178,12 +178,17 @@ board_build.partitions = min_spiffs.csv extends = common:esp32 board = esp32-c5-devkitc-1 build_type = debug +; debug_tool = esp-builtin +; upload_protocol = esp-builtin +; debug_init_break = tbreak setup board_build.f_flash = 80000000L build_flags = -DARDUINO_ESPRESSIF_ESP32C5_DEVKITC_1 -DARDUINO_ESP32C5_DEV - -DBOARD_HAS_PSRAM + ;-DBOARD_HAS_PSRAM -DDEBUG=1 + -DARDUINO_USB_CDC_ON_BOOT=1 + -DARDUINO_USB_MODE=1 ; 0 for CDC + TinyUSB, 1 for Hardware CDC + JTAG -DESP_LOG_LEVEL=5 -DARDUINO_CORE_DEBUG_LEVEL=5 -DARDUINO_DEBUG_LEVEL=5 From 3e921e7744d9840e4036daa6c3f5e5924114de6a Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 03:00:29 +0000 Subject: [PATCH 03/21] ignore wifi nina fork --- platformio.ini | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platformio.ini b/platformio.ini index ead6efe84..032e108ba 100644 --- a/platformio.ini +++ b/platformio.ini @@ -104,13 +104,13 @@ lib_deps = platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.30-alpha1/platform-espressif32.zip ; This is needed for occasional new features and bug fixes ; platform = https://github.com/pioarduino/platform-espressif32#develop -lib_ignore = WiFiNINA, WiFi101, OneWire +lib_ignore = WiFiNINA, WiFiNINA_-_Adafruit_Fork, WiFi101, OneWire monitor_filters = esp32_exception_decoder, time ; Common build environment for ESP8266 platform [common:esp8266] platform = espressif8266 -lib_ignore = WiFiNINA, WiFi101, Adafruit TinyUSB Library, OneWire +lib_ignore = WiFiNINA, WiFiNINA_-_Adafruit_Fork, WiFi101, Adafruit TinyUSB Library, OneWire ; Common build environment for Atmel/Microchip SAMDx platform [common:atsamd] @@ -130,8 +130,10 @@ platform_packages = framework-arduinopico@https://github.com/earlephilhower/ardu framework = arduino board_build.core = earlephilhower board_build.filesystem_size = 0.5m -lib_ignore = WiFiNINA, WiFi101, Adafruit Zero DMA Library, OneWire -lib_compat_mode = soft ; can be stricter once pio detects SleepyDog on RP2040 +build_flags = -DUSE_TINYUSB +; Once https://github.com/platformio/platformio-core > 6.1.11 these can be removed +lib_ignore = WiFiNINA, WiFiNINA_-_Adafruit_Fork, WiFi101, Adafruit Zero DMA Library, OneWire +lib_compat_mode = soft ; can be strict once pio detects SleepyDog on RP2040 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Individual Board Definitions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; From 7cefcf3d3b422fbf601cf6bf47d2fc7ab4087292 Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 03:35:55 +0000 Subject: [PATCH 04/21] Add ESP32-C5, bump ESP32 to 3.3.3 --- platformio.ini | 13 ++++--------- src/Wippersnapper_Boards.h | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/platformio.ini b/platformio.ini index 032e108ba..e77281fce 100644 --- a/platformio.ini +++ b/platformio.ini @@ -101,7 +101,7 @@ lib_deps = ; Common build environment for ESP32 platform [common:esp32] -platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.30-alpha1/platform-espressif32.zip +platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.32/platform-espressif32.zip ; This is needed for occasional new features and bug fixes ; platform = https://github.com/pioarduino/platform-espressif32#develop lib_ignore = WiFiNINA, WiFiNINA_-_Adafruit_Fork, WiFi101, OneWire @@ -185,23 +185,18 @@ build_type = debug ; debug_init_break = tbreak setup board_build.f_flash = 80000000L build_flags = - -DARDUINO_ESPRESSIF_ESP32C5_DEVKITC_1 + -DWS_ESPRESSIF_ESP32C5_DEVKITC_1_N8R4 -DARDUINO_ESP32C5_DEV - ;-DBOARD_HAS_PSRAM -DDEBUG=1 + -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=1 - -DARDUINO_USB_MODE=1 ; 0 for CDC + TinyUSB, 1 for Hardware CDC + JTAG -DESP_LOG_LEVEL=5 - -DARDUINO_CORE_DEBUG_LEVEL=5 - -DARDUINO_DEBUG_LEVEL=5 -DARDUINO_LOG_LEVEL=5 -DCORE_DEBUG_LEVEL=5 - -DARDUHAL_LOG_LEVEL=5 + -DBOARD_HAS_PSRAM board_build.filesystem = littlefs board_build.partitions = min_spiffs.csv - - ; Espressif ESP32-C6 4MB NO PSRAM esp32-c6-devkitm-1 [env:espressif_esp32-c6-devkitm-1] extends = common:esp32 diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h index fdd81dd4c..6d1534ae6 100644 --- a/src/Wippersnapper_Boards.h +++ b/src/Wippersnapper_Boards.h @@ -172,10 +172,10 @@ #define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL #define STATUS_NEOPIXEL_NUM 1 #elif defined(ARDUINO_ESP32C5_DEV) -#define BOARD_ID "feather-esp32c6" +#define BOARD_ID "esp32c5" #define USE_LITTLEFS #define USE_STATUS_NEOPIXEL -#define STATUS_NEOPIXEL_PIN LED_BUILTIN +#define STATUS_NEOPIXEL_PIN PIN_RGB_LED #define STATUS_NEOPIXEL_NUM 1 #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32_V2) #define BOARD_ID "feather-esp32-v2" From cdcd90bcabb7eb24a9917e5e43730fe10fd3a762 Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 15:02:07 +0000 Subject: [PATCH 05/21] Add ESP32-C5 build target --- .github/workflows/build-clang-doxy.yml | 5 +++++ examples/Wippersnapper_demo/.esp32c5_devkitc_1_n8r4.generate | 1 + .../.esp32c5_devkitc_1_n8r4_debug.test.skip | 1 + .../wippersnapper_debug/.esp32c5_devkitc_1_n8r4.test.skip | 1 + .../.esp32c5_devkitc_1_n8r4_debug.generate | 1 + 5 files changed, 9 insertions(+) create mode 100644 examples/Wippersnapper_demo/.esp32c5_devkitc_1_n8r4.generate create mode 100644 examples/Wippersnapper_demo/.esp32c5_devkitc_1_n8r4_debug.test.skip create mode 100644 examples/wippersnapper_debug/.esp32c5_devkitc_1_n8r4.test.skip create mode 100644 examples/wippersnapper_debug/.esp32c5_devkitc_1_n8r4_debug.generate diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index c13ec6432..1251ff045 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -367,6 +367,7 @@ jobs: "itsybitsy_esp32", "dfrobot_beetle_esp32c3", "wippersnapper_qtpy_esp32c3", + "espressif_esp32c5_devkitc_1_n8r4_debug", "wippersnapper_feather_esp32c6" ] include: @@ -375,6 +376,8 @@ jobs: arduino-platform: "dfrobot_beetle_esp32c3" - offset: "0x0" arduino-platform: "wippersnapper_qtpy_esp32c3" + - offset: "0x0" + arduino-platform: "espressif_esp32c5_devkitc_1_n8r4_debug" - offset: "0x0" arduino-platform: "wippersnapper_feather_esp32c6" steps: @@ -905,11 +908,13 @@ jobs: arduino-platform: [ "wippersnapper_feather_esp32c6_debug", + "wippersnapper_feather_esp32c6_debug", ] include: - offset: "0x1000" - offset: "0x0" arduino-platform: "wippersnapper_feather_esp32c6_debug" + steps: - name: "skip if unwanted" continue-on-error: true diff --git a/examples/Wippersnapper_demo/.esp32c5_devkitc_1_n8r4.generate b/examples/Wippersnapper_demo/.esp32c5_devkitc_1_n8r4.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.esp32c5_devkitc_1_n8r4.generate @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_demo/.esp32c5_devkitc_1_n8r4_debug.test.skip b/examples/Wippersnapper_demo/.esp32c5_devkitc_1_n8r4_debug.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.esp32c5_devkitc_1_n8r4_debug.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.esp32c5_devkitc_1_n8r4.test.skip b/examples/wippersnapper_debug/.esp32c5_devkitc_1_n8r4.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.esp32c5_devkitc_1_n8r4.test.skip @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.esp32c5_devkitc_1_n8r4_debug.generate b/examples/wippersnapper_debug/.esp32c5_devkitc_1_n8r4_debug.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.esp32c5_devkitc_1_n8r4_debug.generate @@ -0,0 +1 @@ + From 1969fcbe2232bb08f3c4be61ab3b94a1f642363e Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 15:15:43 +0000 Subject: [PATCH 06/21] Add debug target for ESP32-C5 --- .github/workflows/build-clang-doxy.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 1251ff045..879701af1 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -367,7 +367,7 @@ jobs: "itsybitsy_esp32", "dfrobot_beetle_esp32c3", "wippersnapper_qtpy_esp32c3", - "espressif_esp32c5_devkitc_1_n8r4_debug", + "espressif_esp32c5_devkitc_1_n8r4", "wippersnapper_feather_esp32c6" ] include: @@ -377,7 +377,7 @@ jobs: - offset: "0x0" arduino-platform: "wippersnapper_qtpy_esp32c3" - offset: "0x0" - arduino-platform: "espressif_esp32c5_devkitc_1_n8r4_debug" + arduino-platform: "espressif_esp32c5_devkitc_1_n8r4" - offset: "0x0" arduino-platform: "wippersnapper_feather_esp32c6" steps: @@ -908,12 +908,14 @@ jobs: arduino-platform: [ "wippersnapper_feather_esp32c6_debug", - "wippersnapper_feather_esp32c6_debug", + "esp32c5_devkitc_1_n8r4_debug", ] include: - offset: "0x1000" - offset: "0x0" arduino-platform: "wippersnapper_feather_esp32c6_debug" + - offset: "0x0" + arduino-platform: "esp32c5_devkitc_1_n8r4_debug" steps: - name: "skip if unwanted" From f3ecc12d65ead3b1c53ead4f8b146ec6db74d308 Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 15:19:55 +0000 Subject: [PATCH 07/21] Add ESP32-C5 to supported boards list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 05901544d..7847a022a 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ You will need a **free** [Adafruit IO](https://io.adafruit.com) account to use W |Platform| MCU(s) | |--|--| -|[ESP32-x](https://github.com/espressif/arduino-esp32)| ESP32, ESP32-Sx, ESP32-C3, ESP32-C6 | +|[ESP32-x](https://github.com/espressif/arduino-esp32)| ESP32, ESP32-Sx, ESP32-C3, ESP32-C5, ESP32-C6 | |[ESP8266](https://github.com/esp8266/Arduino)| ESP8266 | |[RP2040](https://github.com/earlephilhower/arduino-pico)| RP2040 MCU w/WiFi (i.e: Pico W) | |[RP2350](https://github.com/earlephilhower/arduino-pico)| RP2350 MCU w/WiFi (i.e: Pico 2W) | From 94130b14ba1acf633f611015e0cb5699b1a46823 Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 15:29:57 +0000 Subject: [PATCH 08/21] Correct BOARD_ID for ESP32-C5 DevKitC-1 N8R4 --- src/Wippersnapper_Boards.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h index 6d1534ae6..c71652cb8 100644 --- a/src/Wippersnapper_Boards.h +++ b/src/Wippersnapper_Boards.h @@ -172,11 +172,14 @@ #define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL #define STATUS_NEOPIXEL_NUM 1 #elif defined(ARDUINO_ESP32C5_DEV) -#define BOARD_ID "esp32c5" +#define BOARD_ID "esp32c5-devkitc-1-n8r4" #define USE_LITTLEFS #define USE_STATUS_NEOPIXEL -#define STATUS_NEOPIXEL_PIN PIN_RGB_LED +#define STATUS_NEOPIXEL_PIN PIN_RGB_LED // 27, or GPIO_NUM+27 if using RGBwrite() #define STATUS_NEOPIXEL_NUM 1 +#ifdef BOARD_HAS_PSRAM +#define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation +#endif #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32_V2) #define BOARD_ID "feather-esp32-v2" #define USE_LITTLEFS From 04d0642185094e8f01170fa57126457bb20bfbb7 Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 15:33:52 +0000 Subject: [PATCH 09/21] Correct board target name to match CI-Arduino --- .github/workflows/build-clang-doxy.yml | 4 ++-- ...r4.generate => .espressif_esp32c5_devkitc_1_n8r4.generate} | 0 ...skip => .espressif_esp32c5_devkitc_1_n8r4_debug.test.skip} | 0 ....test.skip => .espressif_esp32c5_devkitc_1_n8r4.test.skip} | 0 ...erate => .espressif_esp32c5_devkitc_1_n8r4_debug.generate} | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename examples/Wippersnapper_demo/{.esp32c5_devkitc_1_n8r4.generate => .espressif_esp32c5_devkitc_1_n8r4.generate} (100%) rename examples/Wippersnapper_demo/{.esp32c5_devkitc_1_n8r4_debug.test.skip => .espressif_esp32c5_devkitc_1_n8r4_debug.test.skip} (100%) rename examples/wippersnapper_debug/{.esp32c5_devkitc_1_n8r4.test.skip => .espressif_esp32c5_devkitc_1_n8r4.test.skip} (100%) rename examples/wippersnapper_debug/{.esp32c5_devkitc_1_n8r4_debug.generate => .espressif_esp32c5_devkitc_1_n8r4_debug.generate} (100%) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 879701af1..c19d3c3b1 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -908,14 +908,14 @@ jobs: arduino-platform: [ "wippersnapper_feather_esp32c6_debug", - "esp32c5_devkitc_1_n8r4_debug", + "espressif_esp32c5_devkitc_1_n8r4_debug", ] include: - offset: "0x1000" - offset: "0x0" arduino-platform: "wippersnapper_feather_esp32c6_debug" - offset: "0x0" - arduino-platform: "esp32c5_devkitc_1_n8r4_debug" + arduino-platform: "espressif_esp32c5_devkitc_1_n8r4_debug" steps: - name: "skip if unwanted" diff --git a/examples/Wippersnapper_demo/.esp32c5_devkitc_1_n8r4.generate b/examples/Wippersnapper_demo/.espressif_esp32c5_devkitc_1_n8r4.generate similarity index 100% rename from examples/Wippersnapper_demo/.esp32c5_devkitc_1_n8r4.generate rename to examples/Wippersnapper_demo/.espressif_esp32c5_devkitc_1_n8r4.generate diff --git a/examples/Wippersnapper_demo/.esp32c5_devkitc_1_n8r4_debug.test.skip b/examples/Wippersnapper_demo/.espressif_esp32c5_devkitc_1_n8r4_debug.test.skip similarity index 100% rename from examples/Wippersnapper_demo/.esp32c5_devkitc_1_n8r4_debug.test.skip rename to examples/Wippersnapper_demo/.espressif_esp32c5_devkitc_1_n8r4_debug.test.skip diff --git a/examples/wippersnapper_debug/.esp32c5_devkitc_1_n8r4.test.skip b/examples/wippersnapper_debug/.espressif_esp32c5_devkitc_1_n8r4.test.skip similarity index 100% rename from examples/wippersnapper_debug/.esp32c5_devkitc_1_n8r4.test.skip rename to examples/wippersnapper_debug/.espressif_esp32c5_devkitc_1_n8r4.test.skip diff --git a/examples/wippersnapper_debug/.esp32c5_devkitc_1_n8r4_debug.generate b/examples/wippersnapper_debug/.espressif_esp32c5_devkitc_1_n8r4_debug.generate similarity index 100% rename from examples/wippersnapper_debug/.esp32c5_devkitc_1_n8r4_debug.generate rename to examples/wippersnapper_debug/.espressif_esp32c5_devkitc_1_n8r4_debug.generate From 564a01402b7098d186aa9df6922253189ae11333 Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 15:53:22 +0000 Subject: [PATCH 10/21] Strip "espressif_" prefix from board json target names --- .github/workflows/build-clang-doxy.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index c19d3c3b1..6bbe9af4f 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -145,6 +145,8 @@ jobs: board_name=${board_name%_noota} # Remove 'wippersnapper_' prefix if present board_name=${board_name#wippersnapper_} + # Remove 'espressif_' prefix if present + board_name=${board_name#espressif_} content=$(cat ws-boards/boards/${board_name//_/-}/definition.json) { echo 'boardJson< Date: Thu, 6 Nov 2025 16:12:25 +0000 Subject: [PATCH 11/21] WIP: Swap to WIP boards branch --- .github/workflows/build-clang-doxy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 6bbe9af4f..0ba4c52f6 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -418,6 +418,7 @@ jobs: with: repository: adafruit/Wippersnapper_Boards path: ws-boards + ref: add-c5devkit - name: Install CI-Arduino run: bash ci/actions_install.sh - name: Install extra Arduino libraries @@ -957,6 +958,7 @@ jobs: with: repository: adafruit/Wippersnapper_Boards path: ws-boards + ref: add-c5devkit - name: Install CI-Arduino run: bash ci/actions_install.sh - name: Install extra Arduino libraries From 08990f6dc868900763544367b9a45041295e0d0d Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 16:23:18 +0000 Subject: [PATCH 12/21] Use latest esptool for C5 --- .github/workflows/build-clang-doxy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 0ba4c52f6..8b2989c9c 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -456,7 +456,7 @@ jobs: mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: Install Dependencies run: | - pip install esptool==4.6 + pip install esptool - name: build ESP32 platforms run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: Check artifacts @@ -996,7 +996,7 @@ jobs: mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: Install Dependencies run: | - pip3 install esptool==4.6 + pip3 install esptool - name: build ESP32 platforms run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: Check artifacts From 70b002397009b53c5662aa7f21dd57608fe6cf46 Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 16:58:05 +0000 Subject: [PATCH 13/21] clang format --- src/Wippersnapper_Boards.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h index c71652cb8..07315a021 100644 --- a/src/Wippersnapper_Boards.h +++ b/src/Wippersnapper_Boards.h @@ -175,7 +175,8 @@ #define BOARD_ID "esp32c5-devkitc-1-n8r4" #define USE_LITTLEFS #define USE_STATUS_NEOPIXEL -#define STATUS_NEOPIXEL_PIN PIN_RGB_LED // 27, or GPIO_NUM+27 if using RGBwrite() +#define STATUS_NEOPIXEL_PIN PIN_RGB_LED +// PIN_RGB_LED = 27, or GPIO_NUM+27 if using RGBwrite() #define STATUS_NEOPIXEL_NUM 1 #ifdef BOARD_HAS_PSRAM #define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation From 2c2755ad98aabb0201f7db789a4f64b41cfeb63e Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 17:34:10 +0000 Subject: [PATCH 14/21] Correct bootloader offset for C5 --- .github/workflows/build-clang-doxy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 8b2989c9c..fd2e22535 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -378,7 +378,7 @@ jobs: arduino-platform: "dfrobot_beetle_esp32c3" - offset: "0x0" arduino-platform: "wippersnapper_qtpy_esp32c3" - - offset: "0x0" + - offset: "0x2000" arduino-platform: "espressif_esp32c5_devkitc_1_n8r4" - offset: "0x0" arduino-platform: "wippersnapper_feather_esp32c6" @@ -919,7 +919,7 @@ jobs: - offset: "0x1000" - offset: "0x0" arduino-platform: "wippersnapper_feather_esp32c6_debug" - - offset: "0x0" + - offset: "0x2000" arduino-platform: "espressif_esp32c5_devkitc_1_n8r4_debug" steps: From da343ff359de6edf85887892f247e2926d24dd26 Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 19:09:09 +0000 Subject: [PATCH 15/21] Update CI job for C5 (dump merged bin) --- .github/workflows/build-clang-doxy.yml | 2 ++ platformio.ini | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index fd2e22535..919e1b10d 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -465,6 +465,7 @@ jobs: - name: Rename build artifacts to reflect the platform name run: | mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bin + mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.merged.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.auto-merge.bin mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.elf wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.elf mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.map wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.map mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.bootloader.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin @@ -1005,6 +1006,7 @@ jobs: - name: Rename build artifacts to reflect the platform name run: | mv examples/wippersnapper_debug/build/*/wippersnapper_debug.ino.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bin + mv examples/wippersnapper_debug/build/*/wippersnapper_debug.ino.merged.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.auto-merge.bin mv examples/wippersnapper_debug/build/*/wippersnapper_debug.ino.elf wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.elf mv examples/wippersnapper_debug/build/*/wippersnapper_debug.ino.map wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.map mv examples/wippersnapper_debug/build/*/wippersnapper_debug.ino.bootloader.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin diff --git a/platformio.ini b/platformio.ini index e77281fce..4541e8232 100644 --- a/platformio.ini +++ b/platformio.ini @@ -148,7 +148,6 @@ build_flags = -DARDUINO_FEATHER_ESP32 board_build.filesystem = littlefs board_build.partitions = min_spiffs.csv - ; Adafruit ESP32 Feather V2 [env:featheresp32v2] extends = common:esp32 @@ -176,9 +175,9 @@ board_build.filesystem = littlefs board_build.partitions = min_spiffs.csv ; Espressif ESP32-C5 8MB FLASH 2MB PSRAM ESP32-C5-DevKitC-1 -[env:espressif_esp32-c5-devkitc-1] +[env:espressif_esp32-c5-devkitc-1-n8r4] extends = common:esp32 -board = esp32-c5-devkitc-1 +board = esp32-c5-devkitc1-n8r4 build_type = debug ; debug_tool = esp-builtin ; upload_protocol = esp-builtin From 37e8f301bbbe4521e16f97d3912aeb7581523ae4 Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 21:01:54 +0000 Subject: [PATCH 16/21] clang --- src/Wippersnapper_Boards.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h index 07315a021..a456c2fc0 100644 --- a/src/Wippersnapper_Boards.h +++ b/src/Wippersnapper_Boards.h @@ -175,7 +175,7 @@ #define BOARD_ID "esp32c5-devkitc-1-n8r4" #define USE_LITTLEFS #define USE_STATUS_NEOPIXEL -#define STATUS_NEOPIXEL_PIN PIN_RGB_LED +#define STATUS_NEOPIXEL_PIN PIN_RGB_LED // PIN_RGB_LED = 27, or GPIO_NUM+27 if using RGBwrite() #define STATUS_NEOPIXEL_NUM 1 #ifdef BOARD_HAS_PSRAM From 48c5acb5d8a75fc300ee327858463867b8b5c176 Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 22:36:39 +0000 Subject: [PATCH 17/21] Drop boot0 from non-tinyusb targets, use "keep" for flash args --- .github/workflows/build-clang-doxy.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 919e1b10d..9c223a8a7 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -502,13 +502,12 @@ jobs: echo ${{ steps.get_board_json.outputs.boardJson }} echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }} python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \ - --flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \ - --flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \ - --flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \ + --flash-mode keep \ + --flash-freq keep \ + --flash-size keep \ -o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \ ${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ 0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \ - 0xe000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.boot_app0.bin \ 0x10000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bin - name: Zip build artifacts run: | @@ -1045,13 +1044,12 @@ jobs: echo ${{ steps.get_board_json.outputs.boardJson }} echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }} python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \ - --flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \ - --flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \ - --flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \ + --flash-mode keep \ + --flash-freq keep \ + --flash-size keep \ -o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \ ${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ 0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \ - 0xe000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.boot_app0.bin \ 0x10000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bin - name: Zip build artifacts run: | From a70e176f3c414e6cd3d2dbce78de7aa23374c22d Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 22:39:50 +0000 Subject: [PATCH 18/21] CI tidy --- .github/workflows/build-clang-doxy.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 9c223a8a7..a4e89dede 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -465,7 +465,7 @@ jobs: - name: Rename build artifacts to reflect the platform name run: | mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bin - mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.merged.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.auto-merge.bin + # mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.merged.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.auto-merge.bin mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.elf wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.elf mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.map wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.map mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.bootloader.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin @@ -502,9 +502,7 @@ jobs: echo ${{ steps.get_board_json.outputs.boardJson }} echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }} python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \ - --flash-mode keep \ - --flash-freq keep \ - --flash-size keep \ + --flash-mode keep --flash-freq keep --flash-size keep \ -o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \ ${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ 0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \ @@ -1044,9 +1042,7 @@ jobs: echo ${{ steps.get_board_json.outputs.boardJson }} echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }} python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \ - --flash-mode keep \ - --flash-freq keep \ - --flash-size keep \ + --flash-mode keep --flash-freq keep --flash-size keep \ -o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \ ${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ 0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \ From dd8a7e09c5e5b5b8b3961ed3d95418bb4de5ad5e Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 6 Nov 2025 23:38:26 +0000 Subject: [PATCH 19/21] Bump CI to ESP core 3.3.3 --- .github/workflows/build-clang-doxy.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index a4e89dede..20d6a1e26 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -72,7 +72,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-esp333 path: ci - name: Checkout Board Definitions uses: actions/checkout@v4 @@ -291,7 +291,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-esp333 path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh @@ -411,7 +411,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-esp333 path: ci - name: Checkout Board Definitions uses: actions/checkout@v4 @@ -841,7 +841,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-esp333 path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh @@ -949,7 +949,7 @@ jobs: - uses: actions/checkout@v4 with: repository: adafruit/ci-arduino - ref: ci-wippersnapper + ref: ci-wippersnapper-esp333 path: ci - name: Checkout Board Definitions uses: actions/checkout@v4 From ed67e3ec33af7f65ced39ee058a8a02a689da315 Mon Sep 17 00:00:00 2001 From: tyeth Date: Fri, 7 Nov 2025 00:14:41 +0000 Subject: [PATCH 20/21] Use modern esptool command --- .github/workflows/build-clang-doxy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 20d6a1e26..437c71235 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -501,7 +501,7 @@ jobs: run: | echo ${{ steps.get_board_json.outputs.boardJson }} echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }} - python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \ + python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge-bin \ --flash-mode keep --flash-freq keep --flash-size keep \ -o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \ ${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ @@ -1041,7 +1041,7 @@ jobs: run: | echo ${{ steps.get_board_json.outputs.boardJson }} echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }} - python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \ + python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge-bin \ --flash-mode keep --flash-freq keep --flash-size keep \ -o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \ ${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ From d85a86804b9b4d4b4356e0d0e3b7ff1228561718 Mon Sep 17 00:00:00 2001 From: tyeth Date: Fri, 7 Nov 2025 00:21:01 +0000 Subject: [PATCH 21/21] Bump Arduino-ESP32 to 3.3.3 in platformIO.ini --- platformio.ini | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 4541e8232..84a432a3a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -101,7 +101,7 @@ lib_deps = ; Common build environment for ESP32 platform [common:esp32] -platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.32/platform-espressif32.zip +platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.33/platform-espressif32.zip ; This is needed for occasional new features and bug fixes ; platform = https://github.com/pioarduino/platform-espressif32#develop lib_ignore = WiFiNINA, WiFiNINA_-_Adafruit_Fork, WiFi101, OneWire @@ -183,6 +183,10 @@ build_type = debug ; upload_protocol = esp-builtin ; debug_init_break = tbreak setup board_build.f_flash = 80000000L +board_build.flash_size = 8MB +board_build.flash_mode = qio +board_build.boot_mode = dio +board_build.f_cpu = 240000000L build_flags = -DWS_ESPRESSIF_ESP32C5_DEVKITC_1_N8R4 -DARDUINO_ESP32C5_DEV