docs: update changelog for version 1.2.86

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

@@ -32,42 +32,50 @@ 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 -t buildfs  # Build SPIFFS
+        pio run -e esp32dev_ota -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
+        pio run -e esp32dev_ota            # Build firmware
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman.bin
+        cp .pio/build/esp32dev_ota/firmware.bin .pio/build/esp32dev_ota/filaman.bin
-        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/filaman_spiffs.bin
+        cp .pio/build/esp32dev_ota/spiffs.bin .pio/build/esp32dev_ota/filaman_spiffs.bin
         
     - name: Prepare binaries
       run: |
-        cd .pio/build/esp32dev
+        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 }}
@@ -94,8 +102,8 @@ jobs:
           echo "Release created with ID: $RELEASE_ID"
           
           # Upload binaries
-          cd .pio/build/esp32dev
+          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 \

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

@@ -21,20 +21,21 @@ 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 -t buildfs  # Build SPIFFS
+        pio run -e esp32dev_ota -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
+        pio run -e esp32dev_ota            # Build firmware
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman.bin
+        cp .pio/build/esp32dev_ota/firmware.bin .pio/build/esp32dev_ota/filaman.bin
-        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/filaman_spiffs.bin
+        cp .pio/build/esp32dev_ota/spiffs.bin .pio/build/esp32dev_ota/filaman_spiffs.bin
         
     - name: Prepare binaries
       run: |
-        cd .pio/build/esp32dev
+        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/filaman_full.bin \
+          .pio/build/esp32dev_ota/filaman_full.bin
-          .pio/build/esp32dev/filaman_ota.bin \
-          .pio/build/esp32dev/filaman.bin \
-          .pio/build/esp32dev/filaman_spiffs.bin

CHANGELOG.md

@@ -1,5 +1,45 @@
 # 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
+- update Gitea and GitHub release workflows to use esp32dev_ota for building and uploading firmware and SPIFFS binaries
+
+
 ## [1.2.80] - 2025-02-20
 ### Added
 - update Gitea and GitHub release workflows to include new firmware and SPIFFS binaries; fix version display in HTML files to v1.2.78

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.80</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.80</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.80</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.80</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.80</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.80</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.80</span></h1>
+                <h1>FilaMan<span class="version">v1.2.86</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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,
+app0,     app,  ota_0,     0x10000,  0x1C0000,
-app1,     app,  ota_1,     0x1F0000, 0x1E0000,
+app1,     app,  ota_1,     0x1D0000, 0x1C0000,
-spiffs,   data, spiffs,    0x3D0000, 0x30000,
+spiffs,   data, spiffs,    0x390000, 0x60000,

platformio.ini

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

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.")