diff --git a/.github/workflows/gitea-release.yml b/.github/workflows/gitea-release.yml index 41ecc1d..f41a323 100644 --- a/.github/workflows/gitea-release.yml +++ b/.github/workflows/gitea-release.yml @@ -40,8 +40,10 @@ jobs: # Copy firmware binary cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin - # Create SPIFFS binary with magic byte - echo -ne '\xE9' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin + # Create SPIFFS binary with ESP32 image header + # 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 # Create full binary @@ -55,7 +57,7 @@ jobs: 0x1000 bootloader.bin \ 0x8000 partitions.bin \ 0x10000 firmware.bin \ - 0x350000 spiffs.bin) + 0x390000 spiffs.bin) # Verify file sizes echo "File sizes:" diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index f33c932..1f12828 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -47,8 +47,10 @@ jobs: # Copy firmware binary cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin - # Create SPIFFS binary with magic byte - echo -ne '\xE9' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin + # Create SPIFFS binary with ESP32 image header + # 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 # Create full binary (always) @@ -62,7 +64,7 @@ jobs: 0x1000 bootloader.bin \ 0x8000 partitions.bin \ 0x10000 firmware.bin \ - 0x350000 spiffs.bin) + 0x390000 spiffs.bin) # Verify file sizes echo "File sizes:" diff --git a/partitions.csv b/partitions.csv index 99d53af..38d2e5a 100644 --- a/partitions.csv +++ b/partitions.csv @@ -1,6 +1,6 @@ # Name, Type, SubType, Offset, Size, Flags nvs, data, nvs, 0x9000, 0x5000, otadata, data, ota, 0xe000, 0x2000, -app0, app, ota_0, 0x10000, 0x1A0000, -app1, app, ota_1, 0x1B0000, 0x1A0000, -spiffs, data, spiffs, 0x350000, 0xB0000, \ No newline at end of file +app0, app, ota_0, 0x10000, 0x1C0000, +app1, app, ota_1, 0x1D0000, 0x1C0000, +spiffs, data, spiffs, 0x390000, 0x70000, \ No newline at end of file