docs: update changelog for version 1.2.102

docs: update webpages for version v1.2.102
fix: adjust bootloader offset in binary merge for Gitea and GitHub workflows
2025-02-21 18:28:20 +01:00 · 2025-02-21 18:28:20 +01:00 · 2025-02-21 18:28:16 +01:00
4 changed files with 20 additions and 12 deletions
--- a/.github/workflows/providers/gitea-release.yml
+++ b/.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 
-          0x0000 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 \
+          0x1000 bootloader.bin \
+          0x8000 partitions.bin \
+          0x10000 firmware.bin \
          0x390000 spiffs.bin)
        
        # Verify file sizes
--- a/.github/workflows/providers/github-release.yml
+++ b/.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 \
-          0x0000 bootloader.bin \
+          0x1000 bootloader.bin \
          0x8000 partitions.bin \
          0x10000 firmware.bin \
          0x390000 spiffs.bin)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,13 @@
 # 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
--- a/platformio.ini
+++ b/platformio.ini
@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.2.101"
+version = "1.2.102"

 [env:esp32dev]
 platform = espressif32
Author	SHA1	Message	Date
Manuel Weiser	bde14e50e0	docs: update changelog for version 1.2.102 All checks were successful Release Workflow / route (push) Successful in 7s Details Release Workflow / verify-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 3m1s Details	2025-02-21 18:28:20 +01:00
Manuel Weiser	9c656a9bd0	docs: update webpages for version v1.2.102	2025-02-21 18:28:20 +01:00
Manuel Weiser	eae552017d	fix: adjust bootloader offset in binary merge for Gitea and GitHub workflows	2025-02-21 18:28:16 +01:00