Compare commits

..

3 Commits

4 changed files with 20 additions and 12 deletions

@@ -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

@@ -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)

@@ -1,5 +1,13 @@
# Changelog # Changelog
## [1.2.102] - 2025-02-21
### Changed
- update webpages for version v1.2.102
### Fixed
- adjust bootloader offset in binary merge for Gitea and GitHub workflows
## [1.2.101] - 2025-02-21 ## [1.2.101] - 2025-02-21
### Changed ### Changed
- update webpages for version v1.2.101 - update webpages for version v1.2.101

@@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "1.2.101" version = "1.2.102"
[env:esp32dev] [env:esp32dev]
platform = espressif32 platform = espressif32