docs: update changelog for version 1.2.67

CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## [1.2.67] - 2025-02-20
+### Added
+- improve OTA upload handling and add SPIFFS update support
+
+### Changed
+- update webpages for version v1.2.67
+
+
+## [1.2.66] - 2025-02-20
+### Added
+- enhance OTA upload to support SPIFFS updates
+
+### Changed
+- update webpages for version v1.2.66
+
+
+## [1.2.65] - 2025-02-20
+### Changed
+- update webpages for version v1.2.65
+
+
+## [1.2.64] - 2025-02-20
+### Changed
+- update webpages for version v1.2.64
+
+### Fixed
+- improve error handling in OTA upload process
+
+
+## [1.2.63] - 2025-02-20
+### Added
+- update version to 1.2.63
+
+### Changed
+- update webpages for version v1.2.63
+
+
 ## [1.2.62] - 2025-02-20
 ### Added
 - update version to 1.2.62

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.62</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</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.62</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</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.62</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</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.62</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</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.62</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</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.62</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</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.62</span></h1>
+                <h1>FilaMan<span class="version">v1.2.67</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.62"
+version = "1.2.67"
 
 [env:esp32dev]
 platform = espressif32

src/ota.cpp

@@ -4,10 +4,33 @@
 #include <SPIFFS.h>
 #include "commonFS.h"
 
+// Magic byte patterns für verschiedene Image-Typen
+const uint8_t FIRMWARE_MAGIC = 0xE9;
+const uint8_t ESP_MAGIC = 0xE9;
+
+void stopTasks() {
+    // Stop all tasks
+    vTaskSuspend(NULL);
+}
+
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
     static size_t contentLength = 0;
+    static bool isFullImage = false;
+    static uint32_t currentOffset = 0;
+    static uint8_t *spiffsBuffer = nullptr;
+    static size_t spiffsSize = 0;
+    static const uint32_t SPIFFS_START = 0x310000;  // SPIFFS start in full.bin
+    
+    stopTasks();
+    vTaskDelay(100 / portTICK_PERIOD_MS);
 
     if (!index) {
+        // Reset static variables
+        if (spiffsBuffer) {
+            free(spiffsBuffer);
+            spiffsBuffer = nullptr;
+        }
+        
         contentLength = request->contentLength();
         Serial.printf("Update size: %u bytes\n", contentLength);
         
@@ -16,46 +39,136 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
             return;
         }
 
-        // Determine if this is a full image (firmware + SPIFFS) or just firmware
-        bool isFullImage = (contentLength > 0x3D0000); // SPIFFS starts at 0x3D0000
+        if (data[0] == ESP_MAGIC) {
+            isFullImage = (contentLength > 0x3D0000);
             
-        if (isFullImage) {
-            // For full images, we need to make sure we have enough space and properly partition it
-            if (!Update.begin(ESP.getFreeSketchSpace(), U_FLASH)) {
-                Serial.printf("Not enough space for full image: %u bytes required\n", contentLength);
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Full image updates are not supported via OTA. Please use USB update for full images.\"}");
-                return;
-            }
-        } else {
-            // For firmware-only updates
+            // Korrektur: Bei full.bin die gesamte Größe verwenden
             if (!Update.begin(contentLength, U_FLASH)) {
                 Serial.printf("Not enough space: %u required\n", contentLength);
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available for firmware update\"}");
+                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
                 return;
             }
-        }
             
             Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
+            
+            if (isFullImage) {
+                spiffsSize = 0x0F0000;  // 960KB SPIFFS size
+                spiffsBuffer = (uint8_t*)malloc(spiffsSize);
+                if (!spiffsBuffer) {
+                    Serial.println("Failed to allocate SPIFFS buffer");
+                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Memory allocation failed\"}");
+                    return;
+                }
+                memset(spiffsBuffer, 0xFF, spiffsSize); // Initialize buffer with 0xFF
+            }
+        } else {
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
+            return;
+        }
+        currentOffset = 0;
     }
     
-    // Write chunk to flash
+    if (isFullImage) {
+        // Zuerst vollständiges Firmware-Update durchführen
         if (Update.write(data, len) != len) {
-        Update.printError(Serial);
             String errorMsg = Update.errorString();
+            if (errorMsg != "No Error") {
+                Update.printError(Serial);
+                if (spiffsBuffer) free(spiffsBuffer);
+                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing firmware: " + errorMsg + "\"}");
+                return;
+            }
+        }
+        
+        // SPIFFS-Daten separat sammeln
+        if (currentOffset >= SPIFFS_START) {
+            uint32_t spiffsOffset = currentOffset - SPIFFS_START;
+            if (spiffsOffset < spiffsSize) {
+                size_t copyLen = min(len, spiffsSize - spiffsOffset);
+                memcpy(spiffsBuffer + spiffsOffset, data, copyLen);
+                Serial.printf("Collecting SPIFFS data at offset %u, length %u\n", spiffsOffset, copyLen);
+            }
+        }
+    } else {
+        // Normal firmware update
+        if (Update.write(data, len) != len) {
+            String errorMsg = Update.errorString();
+            if (errorMsg != "No Error") {
+                Update.printError(Serial);
                 request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
                 return;
             }
+        }
+    }
+    
+    currentOffset += len;
 
     if (final) {
         if (Update.end(true)) {
-            Serial.println("Update complete");
+            Serial.println("Firmware update complete");
+            
+            if (isFullImage && spiffsBuffer) {
+                Serial.println("Starting SPIFFS update");
+                
+                // Unmount SPIFFS first
+                if (SPIFFS.begin()) {
+                    SPIFFS.end();
+                }
+                
+                // Update SPIFFS
+                if (!Update.begin(spiffsSize, U_SPIFFS)) {
+                    Serial.println("Could not begin SPIFFS update");
+                    free(spiffsBuffer);
+                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS update initialization failed\"}");
+                    return;
+                }
+                
+                if (Update.write(spiffsBuffer, spiffsSize) != spiffsSize) {
+                    Serial.println("SPIFFS Write Failed");
+                    Update.printError(Serial);
+                    free(spiffsBuffer);
+                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS write failed\"}");
+                    return;
+                }
+                
+                if (!Update.end(true)) {
+                    Serial.println("SPIFFS End Failed");
+                    Update.printError(Serial);
+                    free(spiffsBuffer);
+                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS finish failed\"}");
+                    return;
+                }
+                
+                free(spiffsBuffer);
+                spiffsBuffer = nullptr;
+                Serial.println("SPIFFS update complete");
+                
+                // Verify SPIFFS
+                if (!SPIFFS.begin(true)) {
+                    Serial.println("SPIFFS mount after update failed");
+                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS verification failed\"}");
+                    return;
+                }
+                SPIFFS.end();
+            }
+            
             request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
             delay(1000);
             ESP.restart();
         } else {
+            if (spiffsBuffer) {
+                free(spiffsBuffer);
+                spiffsBuffer = nullptr;
+            }
             String errorMsg = Update.errorString();
+            if (errorMsg != "No Error") {
                 Update.printError(Serial);
                 request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
+            } else {
+                request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
+                delay(1000);
+                ESP.restart();
+            }
         }
     }
 }