3D-Druck/Filaman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 110 Wiki Activity

fix: adjust bootloader offset in binary merge for Gitea and GitHub workflows

Browse Source
This commit is contained in:
Manuel Weiser 2025-02-21 18:28:16 +01:00
parent a77918da41
commit eae552017d
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/providers/gitea-release.yml vendored
View File

@ -79,15 +79,15 @@ jobs:
# Create full binary (always) # Create full binary (always)
(cd .pio/build/esp32dev && (cd .pio/build/esp32dev &&
esptool.py --chip esp32 merge_bin esptool.py --chip esp32 merge_bin \
--fill-flash-size 4MB --fill-flash-size 4MB \
--flash_mode dio --flash_mode dio \
--flash_freq 40m --flash_freq 40m \
--flash_size 4MB --flash_size 4MB \
-o filaman_full_${VERSION}.bin -o filaman_full_${VERSION}.bin \
0x0000 bootloader.bin 0x1000 bootloader.bin \
0x8000 partitions.bin 0x8000 partitions.bin \
0x10000 firmware.bin 0x10000 firmware.bin \
0x390000 spiffs.bin) 0x390000 spiffs.bin)
# Verify file sizes # Verify file sizes

4
.github/workflows/providers/github-release.yml vendored
View File

@ -64,14 +64,14 @@ jobs:
cp .pio/build/esp32dev/spiffs.bin .pio.build/esp32dev/webpage_${VERSION}.bin cp .pio/build/esp32dev/spiffs.bin .pio.build/esp32dev/webpage_${VERSION}.bin
# Create full binary (always) # Create full binary (always)
(cd .pio/build/esp32dev && \ (cd .pio/build/esp32dev &&
esptool.py --chip esp32 merge_bin \ esptool.py --chip esp32 merge_bin \
--fill-flash-size 4MB \ --fill-flash-size 4MB \
--flash_mode dio \ --flash_mode dio \
--flash_freq 40m \ --flash_freq 40m \
--flash_size 4MB \ --flash_size 4MB \
-o filaman_full_${VERSION}.bin \ -o filaman_full_${VERSION}.bin \
0x0000 bootloader.bin \ 0x1000 bootloader.bin \
0x8000 partitions.bin \ 0x8000 partitions.bin \
0x10000 firmware.bin \ 0x10000 firmware.bin \
0x390000 spiffs.bin) 0x390000 spiffs.bin)