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

@@ -43,36 +43,31 @@ jobs:
       run: |
         cd .pio/build/esp32dev_ota
         
-        # Create OTA binary (already has correct magic byte)
+        # Create OTA binary (firmware only)
         cp firmware.bin filaman_ota.bin
         
-        # Create a magic byte prepended binary for the bootloader
+        # Use esptool to create the full binary
-        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 \
-          0x0000 bootloader_with_magic.bin \
+          0x1000 bootloader.bin \
           0x8000 partitions.bin \
           0x10000 firmware.bin \
           0x3D0000 spiffs.bin
         
-        # Verify magic bytes
+        # Verify binaries
-        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
-        
-        # 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 }}

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

@@ -32,6 +32,10 @@ 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
         

CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## [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

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

platformio.ini

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