From f73a9700c8775c2b4d91cb6dbc9dfa54c5056ae5 Mon Sep 17 00:00:00 2001 From: Tyeth Gundry Date: Wed, 3 Sep 2025 15:26:39 +0100 Subject: [PATCH 1/3] fix(c6): use esptool 4.6 for ESP32-C6 --- .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 405da123f..b00c76bd8 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -465,7 +465,7 @@ jobs: mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: Install Dependencies run: | - pip install esptool + pip install esptool==4.6 - name: build ESP32 platforms run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: Check artifacts @@ -1005,7 +1005,7 @@ jobs: mv nanopb/pb.h src/nanopb/nanopb.pb.h - name: Install Dependencies run: | - pip3 install esptool + pip3 install esptool==4.6 - name: build ESP32 platforms run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: Check artifacts From 455839a101d5d35a7e56a280980afd5fcf4a7a77 Mon Sep 17 00:00:00 2001 From: Tyeth Gundry Date: Wed, 3 Sep 2025 15:26:58 +0100 Subject: [PATCH 2/3] chore(readme): Add C6 to supported platforms --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7882163b6..05901544d 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-x](https://github.com/espressif/arduino-esp32)| ESP32, ESP32-Sx, ESP32-C3, 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 a2f606521aaafd1dfacd1e91d1b8b503e5f8e3d0 Mon Sep 17 00:00:00 2001 From: Tyeth Gundry Date: Wed, 3 Sep 2025 15:44:24 +0100 Subject: [PATCH 3/3] fix(ci): use old merge_bin syntax --- .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 b00c76bd8..b210e5599 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -507,10 +507,10 @@ 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 \ - --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}} \ + 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}} \ -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 \ @@ -1049,10 +1049,10 @@ 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 \ - --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}} \ + 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}} \ -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 \