docs: update changelog for version 1.2.89

fix: correct version number in HTML files and platformio.ini to v1.2.76
enhance: streamline OTA update handling by removing unnecessary magic byte checks

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

@@ -30,33 +30,50 @@ jobs:
     - name: Install PlatformIO
       run: |
         python -m pip install --upgrade pip
-        pip install --upgrade platformio
+        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            # Build firmware
+        pio run -e esp32dev -t buildfs  # Build SPIFFS
+        pio run -e esp32dev            # Build firmware
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman.bin
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/filaman_spiffs.bin
         
-    - name: Install esptool
+    - name: Prepare binaries
       run: |
-        pip install esptool
+        cd .pio/build/esp32dev
         
-    - name: Merge firmware and SPIFFS
-      run: |
+        # Kopiere die Firmware in den SPIFFS-Build-Ordner
+        cp firmware.bin ./spiffs/firmware.bin
+        
+        # Baue das SPIFFS-Image neu mit der eingebetteten Firmware
+        pio run -t buildfs
+        
+        # Erstelle die Release-Dateien
+        cp spiffs.bin filaman_spiffs.bin
+        
+        # Create full binary with magic byte
+        echo "Creating full binary..."
         esptool.py --chip esp32 merge_bin \
+          --fill-flash-size 4MB \
           --flash_mode dio \
           --flash_freq 40m \
           --flash_size 4MB \
-          -o .pio/build/esp32dev/filaman_full.bin \
-          0x1000 .pio/build/esp32dev/bootloader.bin \
-          0x8000 .pio/build/esp32dev/partitions.bin \
-          0x10000 .pio/build/esp32dev/firmware.bin \
-          0x3D0000 .pio/build/esp32dev/spiffs.bin
-
-    - name: Prepare OTA firmware
-      run: |
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
-    
+          -o filaman_full.bin \
+          0x0000 bootloader.bin \
+          0x8000 partitions.bin \
+          0x10000 firmware.bin \
+          0x390000 spiffs.bin
+        
+        # Verify file sizes
+        echo "File sizes:"
+        ls -lh *.bin
+        
     - name: Create Release
       env:
         TOKEN: ${{ secrets.GITEA_TOKEN }}
@@ -84,7 +101,7 @@ jobs:
           
           # Upload binaries
           cd .pio/build/esp32dev
-          for file in filaman_full.bin filaman_ota.bin; do
+          for file in filaman_ota.bin filaman_spiffs.bin filaman_full.bin; do
             echo "Uploading $file..."
             curl -k -s \
               -X POST \

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

@@ -19,32 +19,49 @@ jobs:
     - name: Install PlatformIO
       run: |
         python -m pip install --upgrade pip
-        pip install --upgrade platformio
+        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            # Build firmware
+        pio run -e esp32dev -t buildfs  # Build SPIFFS
+        pio run -e esp32dev            # Build firmware
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman.bin
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/filaman_spiffs.bin
         
-    - name: Install esptool
+    - name: Prepare binaries
       run: |
-        pip install esptool
+        cd .pio/build/esp32dev
         
-    - name: Merge firmware and SPIFFS
-      run: |
+        # Kopiere die Firmware in den SPIFFS-Build-Ordner
+        cp firmware.bin ./spiffs/firmware.bin
+        
+        # Baue das SPIFFS-Image neu mit der eingebetteten Firmware
+        pio run -t buildfs
+        
+        # Erstelle die Release-Dateien
+        cp spiffs.bin filaman_spiffs.bin
+        
+        # Create full binary with magic byte
+        echo "Creating full binary..."
         esptool.py --chip esp32 merge_bin \
+          --fill-flash-size 4MB \
           --flash_mode dio \
           --flash_freq 40m \
           --flash_size 4MB \
-          -o .pio/build/esp32dev/filaman_full.bin \
-          0x1000 .pio/build/esp32dev/bootloader.bin \
-          0x8000 .pio/build/esp32dev/partitions.bin \
-          0x10000 .pio/build/esp32dev/firmware.bin \
-          0x3D0000 .pio/build/esp32dev/spiffs.bin
-
-    - name: Prepare OTA firmware
-      run: |
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+          -o filaman_full.bin \
+          0x0000 bootloader.bin \
+          0x8000 partitions.bin \
+          0x10000 firmware.bin \
+          0x390000 spiffs.bin
+        
+        # Verify file sizes
+        echo "File sizes:"
+        ls -lh *.bin
     
     - name: Get version from tag
       id: get_version
@@ -67,5 +84,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/filaman_ota.bin
+          .pio/build/esp32dev/filaman_full.bin

CHANGELOG.md

@@ -1,5 +1,91 @@
 # Changelog
 
+## [1.2.89] - 2025-02-20
+### Changed
+- update webpages for version v1.2.89
+- enhance OTA update process with SPIFFS support and improved error handling
+
+
+## [1.2.88] - 2025-02-20
+### Changed
+- update webpages for version v1.2.88
+
+### Fixed
+- improve OTA update handling and logging for better error reporting
+
+
+## [1.2.87] - 2025-02-20
+### Changed
+- update webpages for version v1.2.87
+
+### Fixed
+- update firmware build process and remove unused OTA environment
+
+
+## [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
+
+### Changed
+- update webpages for version v1.2.80
+- bump version to 1.2.79 in platformio.ini
+
+
+## [1.2.79] - 2025-02-20
+### Changed
+- update webpages for version v1.2.79
+- simplify Gitea release workflow by using esptool for binary creation
+
+
+## [1.2.78] - 2025-02-20
+### Changed
+- update webpages for version v1.2.78
+- streamline Gitea release workflow and update version to 1.2.77
+
+### Fixed
+- update Gitea and GitHub release workflows to improve binary preparation and verification fix: correct version number in HTML files and platformio.ini to v1.2.76 enhance: streamline OTA update handling by removing unnecessary magic byte checks
+
+
 ## [1.2.77] - 2025-02-20
 ### Changed
 - optimize Gitea release workflow by simplifying build steps and improving file handling

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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.89</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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.89</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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.89</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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.89</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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.89</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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.89</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.77</span></h1>
+                <h1>FilaMan<span class="version">v1.2.89</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,
-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,

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.2.77"
+version = "1.2.89"
 
 [env:esp32dev]
 platform = espressif32
@@ -45,7 +45,7 @@ build_flags =
     -mtext-section-literals
     '-D VERSION="${common.version}"'
     -DASYNCWEBSERVER_REGEX
-    -DCORE_DEBUG_LEVEL=1
+    -DCORE_DEBUG_LEVEL=3
     -DCONFIG_ARDUHAL_LOG_COLORS=1
     -DOTA_DEBUG=1
     -DARDUINO_RUNNING_CORE=1
@@ -66,6 +66,7 @@ build_flags =
     -DCONFIG_PARTITION_TABLE_OFFSET=0x8000
     -DCONFIG_PARTITION_TABLE_MD5=y
     -DBOOT_APP_PARTITION_OTA_0=1
+    -DCONFIG_LOG_DEFAULT_LEVEL=3
     
 extra_scripts = 
     scripts/extra_script.py

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

src/ota.cpp

@@ -20,59 +20,150 @@ void stopAllTasks() {
     Serial.println("All tasks stopped");
 }
 
+void performStageTwo() {
+    if (!SPIFFS.begin(true)) {
+        Serial.println("Error: Could not mount SPIFFS for stage 2");
+        return;
+    }
+
+    File firmwareFile = SPIFFS.open("/firmware.bin", "r");
+    if (!firmwareFile) {
+        Serial.println("Error: Could not open firmware.bin from SPIFFS");
+        return;
+    }
+
+    size_t firmwareSize = firmwareFile.size();
+    size_t maxAppSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+
+    Serial.printf("Stage 2 - Firmware size: %u bytes\n", firmwareSize);
+    Serial.printf("Available space: %u bytes\n", maxAppSpace);
+
+    if (firmwareSize > maxAppSpace) {
+        Serial.printf("Error: Not enough space for firmware. Need %u bytes but only have %u bytes\n", 
+                    firmwareSize, maxAppSpace);
+        return;
+    }
+
+    if (!Update.begin(firmwareSize)) {
+        Update.printError(Serial);
+        return;
+    }
+
+    size_t written = Update.writeStream(firmwareFile);
+    if (written != firmwareSize) {
+        Update.printError(Serial);
+        return;
+    }
+
+    if (!Update.end(true)) {
+        Update.printError(Serial);
+        return;
+    }
+
+    firmwareFile.close();
+    SPIFFS.remove("/firmware.bin"); // Cleanup
+    Serial.println("Stage 2 update successful, restarting...");
+    delay(500);
+    ESP.restart();
+}
+
+void checkForStagedUpdate() {
+    if (!SPIFFS.begin(true)) {
+        return;
+    }
+
+    if (SPIFFS.exists("/firmware.bin")) {
+        Serial.println("Found staged firmware update, initiating stage 2...");
+        performStageTwo();
+    }
+}
+
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
-    static size_t contentLength = 0;
+    static File stagingFile;
     
     if (!index) {
-        contentLength = request->contentLength();
-        Serial.printf("Update Start: %s (size: %u bytes)\n", filename.c_str(), contentLength);
+        bool isSpiffsUpdate = filename.endsWith("_spiffs.bin");
+        Serial.printf("Update Start: %s (type: %s)\n", filename.c_str(), isSpiffsUpdate ? "SPIFFS" : "OTA");
         
-        if (contentLength == 0) {
+        if (request->contentLength() == 0) {
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
             return;
         }
 
-        // Stoppe alle Tasks vor dem Update
+        // Stop tasks before update
         if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
             stopAllTasks();
             tasksAreStopped = true;
         }
 
-        // Für full.bin keine Magic Byte Prüfung
-        bool isFullImage = (contentLength > 0x300000);
-        if (!isFullImage && data[0] != 0xE9) {
-            Serial.printf("Wrong magic byte: 0x%02X (expected 0xE9)\n", data[0]);
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid firmware format\"}");
+        size_t updateSize = request->contentLength();
+        
+        if (isSpiffsUpdate) {
+            if (!SPIFFS.begin(true)) {
+                request->send(400, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"Could not mount SPIFFS\"}");
+                return;
+            }
+            
+            // Start SPIFFS update
+            if (!Update.begin(updateSize, U_SPIFFS)) {
+                Update.printError(Serial);
+                request->send(400, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"SPIFFS update initialization failed\"}");
+                return;
+            }
+        } else {
+            // Regular OTA update
+            stagingFile = SPIFFS.open("/firmware.bin", "w");
+            if (!stagingFile) {
+                request->send(400, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"Could not create staging file\"}");
+                return;
+            }
+        }
+    }
+
+    if (stagingFile) {
+        // Stage 1: Write to SPIFFS
+        if (stagingFile.write(data, len) != len) {
+            stagingFile.close();
+            SPIFFS.remove("/firmware.bin");
+            request->send(400, "application/json", 
+                        "{\"status\":\"error\",\"message\":\"Write to SPIFFS failed\"}");
             return;
         }
-
-        // Bei full.bin UPDATE_SIZE_UNKNOWN verwenden
-        if (!Update.begin(isFullImage ? UPDATE_SIZE_UNKNOWN : contentLength)) {
+    } else {
+        // Direct SPIFFS update
+        if (Update.write(data, len) != len) {
             Update.printError(Serial);
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA could not begin\"}");
+            request->send(400, "application/json", 
+                        "{\"status\":\"error\",\"message\":\"Write failed\"}");
             return;
         }
-        Serial.printf("Starting %s update\n", isFullImage ? "full" : "firmware");
     }
 
-    // Schreibe Update-Daten
-    if (Update.write(data, len) != len) {
-        Update.printError(Serial);
-        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA write failed\"}");
-        return;
-    }
-
-    // Update abschließen
     if (final) {
-        if (!Update.end(true)) {
-            Update.printError(Serial);
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA end failed\"}");
-            return;
+        if (stagingFile) {
+            // Finish Stage 1
+            stagingFile.close();
+            Serial.println("Stage 1 complete - firmware staged in SPIFFS");
+            request->send(200, "application/json", 
+                        "{\"status\":\"success\",\"message\":\"Update staged successfully! Starting stage 2...\"}");
+            performStageTwo();
+        } else {
+            // Finish direct SPIFFS update
+            if (!Update.end(true)) {
+                Update.printError(Serial);
+                request->send(400, "application/json", 
+                            "{\"status\":\"error\",\"message\":\"Update failed\"}");
+                return;
+            }
+            Serial.println("SPIFFS update successful, restarting...");
+            request->send(200, "application/json", 
+                        "{\"status\":\"success\",\"message\":\"SPIFFS update successful! Device will restart...\",\"restart\":true}");
+            delay(500);
+            ESP.restart();
         }
-        Serial.println("Update successful, restarting...");
-        request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
-        delay(500);
-        ESP.restart();
     }
 }