Skip to content

tinyuf2 build task changes (PR #774) plus Feather s2 migration #779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jul 21, 2025
Merged

tinyuf2 build task changes (PR #774) plus Feather s2 migration #779

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
21144c0
Use tinyuf2 combined.bin as image base
tyeth Jul 16, 2025
9f70757
Correct XIAO tinyusb link
tyeth Jul 16, 2025
87cea3a
CI
tyeth Jul 16, 2025
3ad6500
Swap to using flash_args file for bin offsets
tyeth Jul 16, 2025
451ac02
Copy bootloader/partition table files for flash_args
tyeth Jul 16, 2025
2fc427c
Overwrite tinyusb boot preference
tyeth Jul 16, 2025
7bf7357
Update tinyuf2 fetch process to use bootloaderBoardName
tyeth Jul 17, 2025
26c6c32
WIP: swap boards branch
tyeth Jul 17, 2025
09e4a79
cleanup tinyuf2 downlaod + error handling
tyeth Jul 18, 2025
3ed4536
Swap Feather ESP32-S2 to web-native-usb task
tyeth Jul 18, 2025
df4d916
Use tinyuf2 combined.bin as image base
tyeth Jul 16, 2025
592c75a
Correct XIAO tinyusb link
tyeth Jul 16, 2025
17bc2a2
CI
tyeth Jul 16, 2025
9297c02
Swap to using flash_args file for bin offsets
tyeth Jul 16, 2025
b9746ad
Copy bootloader/partition table files for flash_args
tyeth Jul 16, 2025
0a757d6
Overwrite tinyusb boot preference
tyeth Jul 16, 2025
61590ea
Update tinyuf2 fetch process to use bootloaderBoardName
tyeth Jul 17, 2025
5964f2e
WIP: swap boards branch
tyeth Jul 17, 2025
01a99d9
cleanup tinyuf2 downlaod + error handling
tyeth Jul 18, 2025
0c08edd
Update version to 1.0.0-beta.107
tyeth Jul 18, 2025
714974f
JQ filter
tyeth Jul 18, 2025
69cf749
Split up tinyuf2 steps
tyeth Jul 18, 2025
e0ccdc2
Merge branch 'use_s3_tinyuf2_bins' into featherS2-migration
tyeth Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 39 additions & 12 deletions .github/workflows/build-clang-doxy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
matrix:
arduino-platform:
[
"feather_esp32s2",
"funhouse_noota",
"esp32s3_devkitc_1_n8",
"xiao_esp32s3",
Expand All @@ -33,6 +34,8 @@ jobs:
- offset: "0x0"
- offset: "0x1000"
arduino-platform: "funhouse_noota"
- offset: "0x1000"
arduino-platform: "feather_esp32s2"
steps:
- name: "skip if unwanted"
continue-on-error: true
Expand Down Expand Up @@ -61,6 +64,7 @@ jobs:
with:
repository: adafruit/Wippersnapper_Boards
path: ws-boards
ref: migrate-4mb-to-esptool
- name: Install CI-Arduino
run: bash ci/actions_install.sh
- name: Install extra Arduino libraries
Expand Down Expand Up @@ -141,6 +145,36 @@ jobs:
echo $content
echo EOF
} >> "$GITHUB_OUTPUT"
- name: fetch tinyuf2 combined.bin
run: |
echo "Fetching tinyuf2 bootloader..."
DOWNLOAD_URL=$(curl -s https://api.github.com/repos/adafruit/tinyuf2/releases/latest | \
grep -o "\"browser_download_url\": \"[^\"]*tinyuf2-${{fromJson(steps.get_board_json.outputs.boardJson).bootloaderBoardName}}-[^\"]*\.zip\"" | \
cut -d '"' -f 4)
if [ -z "$DOWNLOAD_URL" ]; then
echo "Error: Could not find the latest tinyuf2 release for board ${fromJson(steps.get_board_json.outputs.boardJson).bootloaderBoardName}."
exit 1
fi
wget "$DOWNLOAD_URL" -O tinyuf2.zip
unzip -o tinyuf2.zip -d .

# Copy files where they're expected to make flash_args happy
mkdir bootloader
cp bootloader.bin bootloader/bootloader.bin
mkdir partition_table
cp partition-table.bin partition_table/partition-table.bin

# Append main app to flash_args file
echo "0x10000 wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.bin" >> flash_args

# Create new_flash_args with esptool parameters first and output file
echo "--flash-mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}}" > new_flash_args
echo "--flash-freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}}" >> new_flash_args
echo "--flash-size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}}" >> new_flash_args
echo "-o wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.combined.bin" >> new_flash_args

# Append flash_args content skipping the first line
tail -n +2 flash_args >> new_flash_args
- name: Check boot_app0 file existence (esp32sx built from core, not-source)
id: check_files
uses: andstor/file-existence-action@v3
Expand All @@ -156,23 +190,17 @@ jobs:
ls /home/runner/Arduino/hardware/espressif/esp32/tools/partitions
- name: boot_app0 file from arduino-cli core
if: steps.check_files.outputs.files_exists == 'true'
run: mv /home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.boot_app0.bin
run: cp /home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.boot_app0.bin
- 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
run: cp /home/runner/Arduino/hardware/espressif/esp32/tools/partitions/boot_app0.bin wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.boot_app0.bin
- name: Copy boot_app0 file to ota_data_initial.bin (overwrite tinyuf2 boot preference)
run: cp wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.boot_app0.bin ota_data_initial.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 \
--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 \
0xe000 wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.boot_app0.bin \
0x10000 wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.bin
python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge-bin @new_flash_args
- name: Zip build artifacts
run: |
zip -r wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.zip wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.*
Expand Down Expand Up @@ -203,7 +231,6 @@ jobs:
"magtag",
"metroesp32s2",
"metro_esp32s3",
"feather_esp32s2",
"feather_esp32s2_tft",
"feather_esp32s2_reverse_tft",
"feather_esp32s3",
Expand Down
2 changes: 1 addition & 1 deletion library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Adafruit WipperSnapper
version=1.0.0-beta.106
version=1.0.0-beta.107
author=Adafruit
maintainer=Adafruit <[email protected]>
sentence=Arduino application for Adafruit.io WipperSnapper
Expand Down
2 changes: 1 addition & 1 deletion src/Wippersnapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
#endif

#define WS_VERSION \
"1.0.0-beta.106" ///< WipperSnapper app. version (semver-formatted)
"1.0.0-beta.107" ///< WipperSnapper app. version (semver-formatted)

// Reserved Adafruit IO MQTT topics
#define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic
Expand Down
Loading