.github/workflows/providers/gitea-release.yml

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

.github/workflows/providers/github-release.yml

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

CHANGELOG.md

@@ -1,13 +1,5 @@
 # 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
 ### Changed
 - update webpages for version v1.2.101

platformio.ini

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