Compare commits

..

No commits in common. "a18749a1ffa7d5530d4dc36b2ba739fcccebad12" and "c5033acadc8269ce2c4062e54d05332aaa56768f" have entirely different histories.

5 changed files with 8 additions and 14 deletions

View File

@ -42,7 +42,7 @@ jobs:
# Create SPIFFS binary with ESP32 image header # 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, chip revision v3.1) # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz, chip revision v3.1)
echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x30\x00\x00\x03\x01\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x60\x00\x00\x03\x01\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Append the actual SPIFFS data # 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
@ -57,7 +57,7 @@ jobs:
0x1000 bootloader.bin \ 0x1000 bootloader.bin \
0x8000 partitions.bin \ 0x8000 partitions.bin \
0x10000 firmware.bin \ 0x10000 firmware.bin \
0x3D0000 spiffs.bin) 0x410000 spiffs.bin)
# Verify file sizes # Verify file sizes
echo "File sizes:" echo "File sizes:"

View File

@ -49,7 +49,7 @@ jobs:
# Create SPIFFS binary with ESP32 image header # 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, chip revision v3.1) # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz, chip revision v3.1)
echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x30\x00\x00\x03\x01\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x60\x00\x00\x03\x01\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Append the actual SPIFFS data # 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
@ -64,7 +64,7 @@ jobs:
0x1000 bootloader.bin \ 0x1000 bootloader.bin \
0x8000 partitions.bin \ 0x8000 partitions.bin \
0x10000 firmware.bin \ 0x10000 firmware.bin \
0x3D0000 spiffs.bin) 0x410000 spiffs.bin)
# Verify file sizes # Verify file sizes
echo "File sizes:" echo "File sizes:"

View File

@ -1,11 +1,5 @@
# Changelog # Changelog
## [1.3.36] - 2025-02-22
### Changed
- update webpages for version v1.3.36
- partition: update SPIFFS binary header and offsets in workflow files
## [1.3.35] - 2025-02-22 ## [1.3.35] - 2025-02-22
### Changed ### Changed
- update webpages for version v1.3.35 - update webpages for version v1.3.35

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, 0x1E0000, app0, app, ota_0, 0x10000, 0x200000,
app1, app, ota_1, 0x1F0000, 0x1E0000, app1, app, ota_1, 0x210000, 0x200000,
spiffs, data, spiffs, 0x3D0000, 0x30000, spiffs, data, spiffs, 0x410000, 0x60000,
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 0x1E0000 0x200000
5 app1 app ota_1 0x1F0000 0x210000 0x1E0000 0x200000
6 spiffs data spiffs 0x3D0000 0x410000 0x30000 0x60000

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "1.3.36" version = "1.3.35"
#test #test