From f95481c52bf7fad8b3af36a44e2739f99e674e40 Mon Sep 17 00:00:00 2001
From: tyeth <tyethgundry@googlemail.com>
Date: Fri, 4 Jul 2025 14:29:25 +0100
Subject: [PATCH 01/13] Add Seeed Studio XIAO ESP32S3

---
 platformio.ini                                | 13 +++++++++++++
 src/Wippersnapper_Boards.h                    |  5 +++++
 src/provisioning/tinyusb/Wippersnapper_FS.cpp |  5 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 2613d2e96..8abe114a3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -435,6 +435,19 @@ build_flags =
 board_build.partitions = noota_ffat.csv
 ; extra_scripts = pre:rename_usb_config.py
 
+; Seeed Studio ESP32 boards:
+
+; Xiao ESP32S3 N8R8 (SENSE)
+[env:seeed-xiao_esp32s3_n8r8]
+extends = common:esp32
+board = seeed_xiao_esp32s3
+build_flags = -DARDUINO_SEEED_XIAO_ESP32S3 -DUSE_TINYUSB -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_MODE=0
+board_build.partitions = tinyuf2-partitions-8MB.csv
+extra_scripts = pre:rename_usb_config.py
+
+
+
+
 ; ESP8266 Boards
 
 ; Adafruit Feather HUZZAH ESP8266
diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h
index 84a07b896..d2ddbd9a4 100644
--- a/src/Wippersnapper_Boards.h
+++ b/src/Wippersnapper_Boards.h
@@ -208,6 +208,11 @@
 #define USE_TINYUSB
 #define USE_STATUS_LED
 #define STATUS_LED_PIN LED_BUILTIN
+#elif defined(ARDUINO_SEEED_XIAO_ESP32S3)
+#define BOARD_ID "seeed-xiao-esp32s3"
+#define USE_TINYUSB
+#define USE_STATUS_LED
+#define STATUS_LED_PIN LED_BUILTIN
 #else
 #warning "Board type not identified within Wippersnapper_Boards.h!"
 #endif
diff --git a/src/provisioning/tinyusb/Wippersnapper_FS.cpp b/src/provisioning/tinyusb/Wippersnapper_FS.cpp
index a3e2dc0c8..9ccc8866b 100644
--- a/src/provisioning/tinyusb/Wippersnapper_FS.cpp
+++ b/src/provisioning/tinyusb/Wippersnapper_FS.cpp
@@ -27,7 +27,8 @@
     defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_ESP32S3_DEV) ||            \
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT) ||                        \
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT) ||                        \
-    defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2)
+    defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2) ||                             \
+    defined(ARDUINO_SEEED_XIAO_ESP32S3)
 #include "Wippersnapper_FS.h"
 #include "print_dependencies.h"
 // On-board external flash (QSPI or SPI) macros should already
@@ -552,7 +553,7 @@ bool Wippersnapper_FS::parseDisplayConfig(displayConfig &dispCfg, bool force_rec
     createDisplayConfig();
 #endif
   }
-  
+
   // Check if display_config.json file exists, if not, generate it
   if (!wipperFatFs.exists("/display_config.json")) {
     WS_DEBUG_PRINTLN("Could not find display_config.json, generating...");

From 305cc456805fc42f6b2df94bae99d2e6dccbd032 Mon Sep 17 00:00:00 2001
From: tyeth <tyethgundry@googlemail.com>
Date: Fri, 4 Jul 2025 16:06:11 +0100
Subject: [PATCH 02/13] Build assets for XIAO ESP32S3

---
 .github/workflows/build-clang-doxy.yml               | 1 +
 examples/Wippersnapper_demo/.xiao_esp32s3.generate   | 1 +
 examples/wippersnapper_debug/.xiao_esp32s3.test.skip | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 examples/Wippersnapper_demo/.xiao_esp32s3.generate
 create mode 100644 examples/wippersnapper_debug/.xiao_esp32s3.test.skip

diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml
index 9d6057e99..95fb0dcda 100644
--- a/.github/workflows/build-clang-doxy.yml
+++ b/.github/workflows/build-clang-doxy.yml
@@ -213,6 +213,7 @@ jobs:
             "qtpy_esp32s2",
             "feather_esp32s3_reverse_tft",
             "qtpy_esp32s3_n4r2",
+            "xiao_esp32s3",
           ]
     steps:
       - name: "skip if unwanted"
diff --git a/examples/Wippersnapper_demo/.xiao_esp32s3.generate b/examples/Wippersnapper_demo/.xiao_esp32s3.generate
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/examples/Wippersnapper_demo/.xiao_esp32s3.generate
@@ -0,0 +1 @@
+
diff --git a/examples/wippersnapper_debug/.xiao_esp32s3.test.skip b/examples/wippersnapper_debug/.xiao_esp32s3.test.skip
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/examples/wippersnapper_debug/.xiao_esp32s3.test.skip
@@ -0,0 +1 @@
+

From bc99adf69b5c3cb900b7da19b6ea22fcc1186d5b Mon Sep 17 00:00:00 2001
From: tyeth <tyethgundry@googlemail.com>
Date: Fri, 4 Jul 2025 16:06:34 +0100
Subject: [PATCH 03/13] 8MB Partitions

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 8abe114a3..81ef016a4 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -370,7 +370,7 @@ extra_scripts =  pre:rename_usb_config.py
 extends = common:esp32
 board = adafruit_qtpy_esp32s3_nopsram
 build_flags = -DARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM
-board_build.partitions = tinyuf2-partitions-4MB.csv
+board_build.partitions = tinyuf2-partitions-8MB.csv
 extra_scripts = pre:rename_usb_config.py
 
 ; Adafruit QT Py ESP32-S3 with PSRAM

From 71f829bbdcab1985624d6f8e00c42e4a300129ec Mon Sep 17 00:00:00 2001
From: tyeth <tyethgundry@googlemail.com>
Date: Fri, 4 Jul 2025 17:36:10 +0100
Subject: [PATCH 04/13] Correct Board ID for XIAO S3

---
 platformio.ini             | 2 +-
 src/Wippersnapper_Boards.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 81ef016a4..638f11205 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -441,7 +441,7 @@ board_build.partitions = noota_ffat.csv
 [env:seeed-xiao_esp32s3_n8r8]
 extends = common:esp32
 board = seeed_xiao_esp32s3
-build_flags = -DARDUINO_SEEED_XIAO_ESP32S3 -DUSE_TINYUSB -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_MODE=0
+build_flags = -DARDUINO_XIAO_ESP32S3 -DUSE_TINYUSB -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_MODE=0
 board_build.partitions = tinyuf2-partitions-8MB.csv
 extra_scripts = pre:rename_usb_config.py
 
diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h
index d2ddbd9a4..c831d2edc 100644
--- a/src/Wippersnapper_Boards.h
+++ b/src/Wippersnapper_Boards.h
@@ -208,7 +208,7 @@
 #define USE_TINYUSB
 #define USE_STATUS_LED
 #define STATUS_LED_PIN LED_BUILTIN
-#elif defined(ARDUINO_SEEED_XIAO_ESP32S3)
+#elif defined(ARDUINO_XIAO_ESP32S3)
 #define BOARD_ID "seeed-xiao-esp32s3"
 #define USE_TINYUSB
 #define USE_STATUS_LED

From 47bcf53134c24b9254dcf8b8fdccf572f3c7a8fd Mon Sep 17 00:00:00 2001
From: Tyeth Gundry <tyethgundry@googlemail.com>
Date: Thu, 10 Jul 2025 19:08:45 +0100
Subject: [PATCH 05/13] Move XIAO S3 to zip+uf2 build task

---
 .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 95fb0dcda..74674e929 100644
--- a/.github/workflows/build-clang-doxy.yml
+++ b/.github/workflows/build-clang-doxy.yml
@@ -27,7 +27,8 @@ jobs:
         arduino-platform:
           [
             "funhouse_noota",
-            "esp32s3_devkitc_1_n8"
+            "esp32s3_devkitc_1_n8",
+            "xiao_esp32s3",
           ]
         include:
           - offset: "0x0"
@@ -213,7 +214,6 @@ jobs:
             "qtpy_esp32s2",
             "feather_esp32s3_reverse_tft",
             "qtpy_esp32s3_n4r2",
-            "xiao_esp32s3",
           ]
     steps:
       - name: "skip if unwanted"

From a8be947ec586cd470fddd1835a3058a7b9d7fb11 Mon Sep 17 00:00:00 2001
From: Tyeth Gundry <tyethgundry@googlemail.com>
Date: Thu, 10 Jul 2025 19:23:12 +0100
Subject: [PATCH 06/13] Enable PSRAM and kick CI

---
 src/Wippersnapper_Boards.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h
index c831d2edc..13bbd00a7 100644
--- a/src/Wippersnapper_Boards.h
+++ b/src/Wippersnapper_Boards.h
@@ -210,6 +210,8 @@
 #define STATUS_LED_PIN LED_BUILTIN
 #elif defined(ARDUINO_XIAO_ESP32S3)
 #define BOARD_ID "seeed-xiao-esp32s3"
+#define BOARD_HAS_PSRAM
+#define USE_PSRAM
 #define USE_TINYUSB
 #define USE_STATUS_LED
 #define STATUS_LED_PIN LED_BUILTIN

From ec4e48bb8608052d6dcae4465f5f243e96109c93 Mon Sep 17 00:00:00 2001
From: Tyeth Gundry <tyethgundry@googlemail.com>
Date: Thu, 10 Jul 2025 19:28:57 +0100
Subject: [PATCH 07/13] CI: Fix continue-on-error usage

---
 .github/workflows/build-clang-doxy.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml
index 74674e929..eb91b9b90 100644
--- a/.github/workflows/build-clang-doxy.yml
+++ b/.github/workflows/build-clang-doxy.yml
@@ -20,7 +20,6 @@ jobs:
   build-esp32sx-esptool:
     name: 🏗️ESP32-Sx(lvgl)
     runs-on: ubuntu-latest
-    continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
@@ -36,6 +35,7 @@ jobs:
             arduino-platform: "funhouse_noota"
     steps:
       - name: "skip if unwanted"
+        continue-on-error: true
         if: |
           github.event_name == 'workflow_dispatch' &&
           github.event.inputs.board != '' &&
@@ -195,7 +195,6 @@ jobs:
   build-esp32sx:
     name: 🏗️ESP32-Sx
     runs-on: ubuntu-latest
-    continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
@@ -217,6 +216,7 @@ jobs:
           ]
     steps:
       - name: "skip if unwanted"
+        continue-on-error: true
         if: |
           github.event_name == 'workflow_dispatch' &&
           github.event.inputs.board != '' &&
@@ -307,7 +307,6 @@ jobs:
   build-esp32:
     name: 🏗️ESP32/Cx
     runs-on: ubuntu-latest
-    continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
@@ -330,6 +329,7 @@ jobs:
             arduino-platform: "wippersnapper_feather_esp32c6"
     steps:
       - name: "skip if unwanted"
+        continue-on-error: true
         if: |
           github.event_name == 'workflow_dispatch' &&
           github.event.inputs.board != '' &&
@@ -456,7 +456,6 @@ jobs:
   build-samd:
     name: 🏗️SAMD
     runs-on: ubuntu-latest
-    continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
@@ -468,6 +467,7 @@ jobs:
           ]
     steps:
       - name: "skip if unwanted"
+        continue-on-error: true
         if: |
           github.event_name == 'workflow_dispatch' &&
           github.event.inputs.board != '' &&
@@ -543,13 +543,13 @@ jobs:
   build-rp2040:
     name: 🏗️RP2040
     runs-on: ubuntu-latest
-    continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
         arduino-platform: ["picow_rp2040_tinyusb", "picow_rp2350_tinyusb"]
     steps:
       - name: "skip if unwanted"
+        continue-on-error: true
         if: |
           github.event_name == 'workflow_dispatch' &&
           github.event.inputs.board != '' &&
@@ -622,13 +622,13 @@ jobs:
   build-esp8266:
     name: 🏗️ESP8266
     runs-on: ubuntu-latest
-    continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
         arduino-platform: ["feather_esp8266"]
     steps:
       - name: "skip if unwanted"
+        continue-on-error: true
         if: |
           github.event_name == 'workflow_dispatch' &&
           github.event.inputs.board != '' &&
@@ -708,7 +708,6 @@ jobs:
   build-esp32sx-dev:
     name: 🏗️ESP32-Sx(DEV)
     runs-on: ubuntu-latest
-    continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
@@ -726,6 +725,7 @@ jobs:
           ]
     steps:
       - name: "skip if unwanted"
+        continue-on-error: true
         if: |
           github.event_name == 'workflow_dispatch' &&
           github.event.inputs.board != '' &&
@@ -816,7 +816,6 @@ jobs:
   build-esp32-dev:
     name: 🏗️ESP32/Cx(DEV)
     runs-on: ubuntu-latest
-    continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
@@ -830,6 +829,7 @@ jobs:
             arduino-platform: "wippersnapper_feather_esp32c6_debug"
     steps:
       - name: "skip if unwanted"
+        continue-on-error: true
         if: |
           github.event_name == 'workflow_dispatch' &&
           github.event.inputs.board != '' &&

From ebd3938ae97d57a600aa8e3a1ec139cc6f6fa288 Mon Sep 17 00:00:00 2001
From: Tyeth Gundry <tyethgundry@googlemail.com>
Date: Thu, 10 Jul 2025 20:29:28 +0100
Subject: [PATCH 08/13] Test other task for xiao

---
 .github/workflows/build-clang-doxy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml
index eb91b9b90..4eccc400f 100644
--- a/.github/workflows/build-clang-doxy.yml
+++ b/.github/workflows/build-clang-doxy.yml
@@ -213,6 +213,7 @@ jobs:
             "qtpy_esp32s2",
             "feather_esp32s3_reverse_tft",
             "qtpy_esp32s3_n4r2",
+            "xiao_esp32s3",
           ]
     steps:
       - name: "skip if unwanted"

From 0d6a5538b05f744c4479f19123eefe93ec020d77 Mon Sep 17 00:00:00 2001
From: Tyeth Gundry <tyethgundry@googlemail.com>
Date: Thu, 10 Jul 2025 21:16:24 +0100
Subject: [PATCH 09/13] fix if defined for xiao

---
 src/provisioning/tinyusb/Wippersnapper_FS.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/provisioning/tinyusb/Wippersnapper_FS.cpp b/src/provisioning/tinyusb/Wippersnapper_FS.cpp
index 9ccc8866b..3981c72a6 100644
--- a/src/provisioning/tinyusb/Wippersnapper_FS.cpp
+++ b/src/provisioning/tinyusb/Wippersnapper_FS.cpp
@@ -28,7 +28,7 @@
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT) ||                        \
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT) ||                        \
     defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2) ||                             \
-    defined(ARDUINO_SEEED_XIAO_ESP32S3)
+    defined(ARDUINO_XIAO_ESP32S3)
 #include "Wippersnapper_FS.h"
 #include "print_dependencies.h"
 // On-board external flash (QSPI or SPI) macros should already

From 9695762e75f281e63bc1a68791642a5512ea98ff Mon Sep 17 00:00:00 2001
From: Tyeth Gundry <tyethgundry@googlemail.com>
Date: Thu, 10 Jul 2025 21:16:41 +0100
Subject: [PATCH 10/13] Revert "Test other task for xiao"

This reverts commit ebd3938ae97d57a600aa8e3a1ec139cc6f6fa288.
---
 .github/workflows/build-clang-doxy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml
index 4eccc400f..eb91b9b90 100644
--- a/.github/workflows/build-clang-doxy.yml
+++ b/.github/workflows/build-clang-doxy.yml
@@ -213,7 +213,6 @@ jobs:
             "qtpy_esp32s2",
             "feather_esp32s3_reverse_tft",
             "qtpy_esp32s3_n4r2",
-            "xiao_esp32s3",
           ]
     steps:
       - name: "skip if unwanted"

From f95ec8d84dc15d8bb4e4eff725cfac0f2403c52f Mon Sep 17 00:00:00 2001
From: Tyeth Gundry <tyethgundry@googlemail.com>
Date: Fri, 11 Jul 2025 16:27:45 +0100
Subject: [PATCH 11/13] Update flash param names for newest esptool

---
 .github/workflows/build-clang-doxy.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml
index eb91b9b90..eaad1c2be 100644
--- a/.github/workflows/build-clang-doxy.yml
+++ b/.github/workflows/build-clang-doxy.yml
@@ -165,9 +165,9 @@ 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 ${{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}} \
             -o wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.combined.bin \
             ${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.bootloader.bin \
             0x8000 wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.partitions.bin \
@@ -435,9 +435,9 @@ 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 ${{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}} \
             -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 \
@@ -937,9 +937,9 @@ 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 ${{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}} \
             -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 a4723b7ff24f203383855cad3262a63cad43ee90 Mon Sep 17 00:00:00 2001
From: Tyeth Gundry <tyethgundry@googlemail.com>
Date: Fri, 11 Jul 2025 16:43:34 +0100
Subject: [PATCH 12/13] rename merge_bin to merge-bin

---
 .github/workflows/build-clang-doxy.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml
index eaad1c2be..f2a3f82f2 100644
--- a/.github/workflows/build-clang-doxy.yml
+++ b/.github/workflows/build-clang-doxy.yml
@@ -160,11 +160,11 @@ jobs:
       - name: boot_app0 file from esp32 source bsp
         if: steps.check_files.outputs.files_exists == 'false'
         run: mv /home/runner/Arduino/hardware/espressif/esp32/tools/partitions/boot_app0.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.boot_app0.bin
-      - name: Create combined binary using Esptool merge_bin
+      - name: Create combined binary using Esptool merge-bin
         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 ${{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}} \
@@ -430,11 +430,11 @@ jobs:
             echo $content
             echo EOF
           } >> "$GITHUB_OUTPUT"
-      - name: Create combined binary using Esptool merge_bin
+      - name: Create combined binary using Esptool merge-bin
         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 ${{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}} \
@@ -932,11 +932,11 @@ jobs:
             echo $content
             echo EOF
           } >> "$GITHUB_OUTPUT"
-      - name: Create combined binary using Esptool merge_bin
+      - name: Create combined binary using Esptool merge-bin
         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 ${{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}} \

From 3308d7268f076d34297fbfb5e1ff426cd161b69c Mon Sep 17 00:00:00 2001
From: Tyeth Gundry <tyethgundry@googlemail.com>
Date: Fri, 11 Jul 2025 17:06:18 +0100
Subject: [PATCH 13/13] Use latest esptool for Cx builds

---
 .github/workflows/build-clang-doxy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml
index f2a3f82f2..e5be7e9cd 100644
--- a/.github/workflows/build-clang-doxy.yml
+++ b/.github/workflows/build-clang-doxy.yml
@@ -392,7 +392,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