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

partition: update SPIFFS binary creation and offsets in workflow files

Browse Source
This commit is contained in:
Manuel Weiser 2025-02-22 10:38:34 +01:00
parent 16362e66a3
commit c86cc7173e
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/gitea-release.yml vendored
View File

@ -40,8 +40,10 @@ jobs:
# Copy firmware binary # Copy firmware binary
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
# Create SPIFFS binary with magic byte # Create SPIFFS binary with ESP32 image header
echo -ne '\xE9' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz)
echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x70\x00\x00\x00\x00\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Append the actual SPIFFS data
cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create full binary # Create full binary
@ -55,7 +57,7 @@ jobs:
0x1000 bootloader.bin \ 0x1000 bootloader.bin \
0x8000 partitions.bin \ 0x8000 partitions.bin \
0x10000 firmware.bin \ 0x10000 firmware.bin \
0x350000 spiffs.bin) 0x390000 spiffs.bin)
# Verify file sizes # Verify file sizes
echo "File sizes:" echo "File sizes:"

8
.github/workflows/github-release.yml vendored
View File

@ -47,8 +47,10 @@ jobs:
# Copy firmware binary # Copy firmware binary
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
# Create SPIFFS binary with magic byte # Create SPIFFS binary with ESP32 image header
echo -ne '\xE9' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz)
echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x70\x00\x00\x00\x00\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Append the actual SPIFFS data
cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create full binary (always) # Create full binary (always)
@ -62,7 +64,7 @@ jobs:
0x1000 bootloader.bin \ 0x1000 bootloader.bin \
0x8000 partitions.bin \ 0x8000 partitions.bin \
0x10000 firmware.bin \ 0x10000 firmware.bin \
0x350000 spiffs.bin) 0x390000 spiffs.bin)
# Verify file sizes # Verify file sizes
echo "File sizes:" echo "File sizes:"

6
partitions.csv
View File

@ -1,6 +1,6 @@
# Name, Type, SubType, Offset, Size, Flags # Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x5000, nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000, otadata, data, ota, 0xe000, 0x2000,
app0, app, ota_0, 0x10000, 0x1A0000, app0, app, ota_0, 0x10000, 0x1C0000,
app1, app, ota_1, 0x1B0000, 0x1A0000, app1, app, ota_1, 0x1D0000, 0x1C0000,
spiffs, data, spiffs, 0x350000, 0xB0000, spiffs, data, spiffs, 0x390000, 0x70000,
1 # Name Type SubType Offset Size Flags
2 nvs data nvs 0x9000 0x5000
3 otadata data ota 0xe000 0x2000
4 app0 app ota_0 0x10000 0x1A0000 0x1C0000
5 app1 app ota_1 0x1B0000 0x1D0000 0x1A0000 0x1C0000
6 spiffs data spiffs 0x350000 0x390000 0xB0000 0x70000