docs: update changelog for version 1.2.86

docs: update webpages for version v1.2.86
fix: update SPIFFS offset and size in release workflows and partitions.csv
2025-02-20 19:09:35 +01:00 · 2025-02-20 19:09:35 +01:00 · 2025-02-20 19:09:28 +01:00 · 2025-02-20 18:37:57 +01:00 · 2025-02-20 18:37:57 +01:00 · 2025-02-20 18:37:51 +01:00
13 changed files with 89 additions and 37 deletions
--- a/.github/workflows/providers/gitea-release.yml
+++ b/.github/workflows/providers/gitea-release.yml
@ -32,6 +32,11 @@ jobs:
        python -m pip install --upgrade pip
        pip install --upgrade platformio esptool
    
+    - name: Install xxd
+      run: |
+        sudo apt-get update
+        sudo apt-get install xxd
+    
    - name: Build Firmware
      run: |
        pio run -e esp32dev_ota -t buildfs  # Build SPIFFS
@ -43,31 +48,34 @@ jobs:
      run: |
        cd .pio/build/esp32dev_ota
        
-        # Create OTA binary (firmware only)
+        # Create OTA binary (already has correct magic byte)
        cp firmware.bin filaman_ota.bin
        
-        # Use esptool to create the full binary
+        # Create a magic byte prepended binary for the bootloader
+        echo -ne '\xE9' > bootloader_with_magic.bin
+        cat bootloader.bin >> bootloader_with_magic.bin
+        
+        echo "Creating full binary with magic byte..."
        esptool.py --chip esp32 merge_bin \
+          --fill-flash-size 4MB \
          --flash_mode dio \
          --flash_freq 40m \
          --flash_size 4MB \
-          --target-offset 0x0 \
          -o filaman_full.bin \
-          0x1000 bootloader.bin \
+          0x0000 bootloader_with_magic.bin \
          0x8000 partitions.bin \
          0x10000 firmware.bin \
-          0x3D0000 spiffs.bin
+          0x390000 spiffs.bin
        
-        # Verify binaries
+        # Verify magic bytes
+        echo "Checking magic bytes:"
+        echo "Full binary first bytes:"
+        xxd -l 16 filaman_full.bin
+        
+        # Verify file sizes
        echo "File sizes:"
        ls -lh *.bin
        
-        echo "Binary information:"
-        echo "OTA binary info:"
-        esptool.py --chip esp32 image_info filaman_ota.bin || true
-        echo "Full binary first 64 bytes:"
-        od -A x -t x1z -N 64 filaman_full.bin
-
    - name: Create Release
      env:
        TOKEN: ${{ secrets.GITEA_TOKEN }}
@ -95,7 +103,7 @@ jobs:
          
          # Upload binaries
          cd .pio/build/esp32dev_ota
-          for file in filaman_full.bin filaman_ota.bin filaman.bin filaman_spiffs.bin; do
+          for file in filaman_full.bin; do
            echo "Uploading $file..."
            curl -k -s \
              -X POST \
--- a/.github/workflows/providers/github-release.yml
+++ b/.github/workflows/providers/github-release.yml
@ -21,6 +21,11 @@ jobs:
        python -m pip install --upgrade pip
        pip install --upgrade platformio esptool
    
+    - name: Install xxd
+      run: |
+        sudo apt-get update
+        sudo apt-get install xxd
+    
    - name: Build Firmware
      run: |
        pio run -e esp32dev_ota -t buildfs  # Build SPIFFS
@ -32,10 +37,6 @@ jobs:
      run: |
        cd .pio/build/esp32dev_ota
        
-        # Debug: Show all generated files
-        echo "Files in build directory:"
-        ls -la
-        
        # Create OTA binary (already has correct magic byte)
        cp firmware.bin filaman_ota.bin
        
@ -53,14 +54,12 @@ jobs:
          0x0000 bootloader_with_magic.bin \
          0x8000 partitions.bin \
          0x10000 firmware.bin \
-          0x3D0000 spiffs.bin
+          0x390000 spiffs.bin
        
        # Verify magic bytes
        echo "Checking magic bytes:"
-        echo "OTA binary first bytes:"
-        hexdump -C -n 16 filaman_ota.bin
        echo "Full binary first bytes:"
-        hexdump -C -n 16 filaman_full.bin
+        xxd -l 16 filaman_full.bin
        
        # Verify file sizes
        echo "File sizes:"
@ -87,7 +86,4 @@ jobs:
        gh release create "${{ github.ref_name }}" \
          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
          --notes "${{ steps.changelog.outputs.CHANGES }}" \
-          .pio/build/esp32dev_ota/filaman_full.bin \
-          .pio/build/esp32dev_ota/filaman_ota.bin \
-          .pio/build/esp32dev_ota/filaman.bin \
-          .pio/build/esp32dev_ota/filaman_spiffs.bin
+          .pio/build/esp32dev_ota/filaman_full.bin
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,39 @@
 # Changelog

+## [1.2.86] - 2025-02-20
+### Changed
+- update webpages for version v1.2.86
+
+### Fixed
+- update SPIFFS offset and size in release workflows and partitions.csv
+
+
+## [1.2.85] - 2025-02-20
+### Added
+- ci: streamline release workflows by removing unnecessary binary uploads and adding SPIFFS formatting
+
+### Changed
+- update webpages for version v1.2.85
+
+
+## [1.2.84] - 2025-02-20
+### Changed
+- update webpages for version v1.2.84
+- ci: update installation steps for xxd to include package list update
+
+
+## [1.2.83] - 2025-02-20
+### Changed
+- update webpages for version v1.2.83
+- replace hexdump with xxd for magic byte verification in release workflows
+
+
+## [1.2.82] - 2025-02-20
+### Changed
+- update webpages for version v1.2.82
+- enhance Gitea and GitHub release workflows to include magic byte handling and improve binary verification
+
+
 ## [1.2.81] - 2025-02-20
 ### Changed
 - update webpages for version v1.2.81
--- a/html/header.html
+++ b/html/header.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.81</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/index.html
+++ b/html/index.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.81</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/rfid.html
+++ b/html/rfid.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.81</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/spoolman.html
+++ b/html/spoolman.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.81</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/upgrade.html
+++ b/html/upgrade.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.81</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/waage.html
+++ b/html/waage.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.81</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/wifi.html
+++ b/html/wifi.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.81</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- 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,  0x1E0000,
-app1,     app,  ota_1,     0x1F0000, 0x1E0000,
-spiffs,   data, spiffs,    0x3D0000, 0x30000,
+app0,     app,  ota_0,     0x10000,  0x1C0000,
+app1,     app,  ota_1,     0x1D0000, 0x1C0000,
+spiffs,   data, spiffs,    0x390000, 0x60000,
--- a/platformio.ini
+++ b/platformio.ini
@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.2.81"
+version = "1.2.86"

 [env:esp32dev]
 platform = espressif32
--- a/scripts/pre_spiffs.py
+++ b/scripts/pre_spiffs.py
@ -4,4 +4,18 @@ Import("env")
 exec(open("./scripts/pre_build.py").read())

 # Bind to SPIFFS build
-env.AddPreAction("buildfs", replace_version)
+env.AddPreAction("buildfs", replace_version)
+
+import os
+import shutil
+from SCons.Script import DefaultEnvironment
+
+env = DefaultEnvironment()
+
+# Format SPIFFS partition before uploading new files
+spiffs_dir = os.path.join(env.subst("$BUILD_DIR"), "spiffs")
+if os.path.exists(spiffs_dir):
+    shutil.rmtree(spiffs_dir)
+os.makedirs(spiffs_dir)
+
+print("SPIFFS partition formatted.")
Author	SHA1	Message	Date
Manuel Weiser	c3040b3c29	docs: update changelog for version 1.2.86 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 2m36s Details	2025-02-20 19:09:35 +01:00
Manuel Weiser	d7ba67085d	docs: update webpages for version v1.2.86	2025-02-20 19:09:35 +01:00
Manuel Weiser	48efb9e21a	fix: update SPIFFS offset and size in release workflows and partitions.csv	2025-02-20 19:09:28 +01:00
Manuel Weiser	e983ba6e44	docs: update changelog for version 1.2.85 All checks were successful Release Workflow / route (push) Successful in 7s Details Release Workflow / verify-provider (push) Successful in 2s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 2m48s Details	2025-02-20 18:37:57 +01:00
Manuel Weiser	37171d6eca	docs: update webpages for version v1.2.85	2025-02-20 18:37:57 +01:00
Manuel Weiser	ebb08a7a66	ci: streamline release workflows by removing unnecessary binary uploads and adding SPIFFS formatting	2025-02-20 18:37:51 +01:00
Manuel Weiser	b5330af351	docs: update changelog for version 1.2.84 All checks were successful Release Workflow / route (push) Successful in 10s Details Release Workflow / verify-provider (push) Successful in 4s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 2m41s Details	2025-02-20 18:04:06 +01:00
Manuel Weiser	4919d34484	docs: update webpages for version v1.2.84	2025-02-20 18:04:06 +01:00
Manuel Weiser	2da641d604	ci: update installation steps for xxd to include package list update	2025-02-20 18:04:00 +01:00
Manuel Weiser	ce413965c7	docs: update changelog for version 1.2.83 Some checks failed 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) Failing after 25s Details	2025-02-20 18:01:22 +01:00
Manuel Weiser	3fafed930e	docs: update webpages for version v1.2.83	2025-02-20 18:01:22 +01:00
Manuel Weiser	e1c604ee8d	refactor: replace hexdump with xxd for magic byte verification in release workflows	2025-02-20 18:01:16 +01:00
Manuel Weiser	11bbfb7db6	docs: update changelog for version 1.2.82 Some checks failed Release Workflow / route (push) Successful in 6s Details Release Workflow / verify-provider (push) Successful in 2s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m27s Details	2025-02-20 17:53:00 +01:00
Manuel Weiser	71d8f7ec5a	docs: update webpages for version v1.2.82	2025-02-20 17:53:00 +01:00
Manuel Weiser	f4518e4a36	refactor: enhance Gitea and GitHub release workflows to include magic byte handling and improve binary verification	2025-02-20 17:52:18 +01:00