CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## [1.2.72] - 2025-02-20
-### Changed
-- update webpages for version v1.2.72
-- simplify OTA update process by removing unnecessary buffer and adjusting offsets
-
-
 ## [1.2.71] - 2025-02-20
 ### Added
 - update version number to v1.2.65 in HTML files and platformio.ini; add script to create full binary

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.72</span></h1>
+                <h1>FilaMan<span class="version">v1.2.71</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.72</span></h1>
+                <h1>FilaMan<span class="version">v1.2.71</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.72</span></h1>
+                <h1>FilaMan<span class="version">v1.2.71</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.72</span></h1>
+                <h1>FilaMan<span class="version">v1.2.71</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.72</span></h1>
+                <h1>FilaMan<span class="version">v1.2.71</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.72</span></h1>
+                <h1>FilaMan<span class="version">v1.2.71</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.72</span></h1>
+                <h1>FilaMan<span class="version">v1.2.71</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.72"
+version = "1.2.71"
 
 [env:esp32dev]
 platform = espressif32
@@ -66,7 +66,7 @@ extra_scripts =
     pre:scripts/pre_spiffs.py    ; wird als zweites ausgeführt
     pre:scripts/combine_html.py  ; wird als drittes ausgeführt
     scripts/gzip_files.py
-    # scripts/create_full_bin.py  # Nicht mehr benötigt, da full.bin im Workflow erstellt wird
+    scripts/create_full_bin.py  ; Neues Skript zur Erstellung der full.bin
 
 ; Remove or comment out the targets line
 ;targets = buildfs, build

src/ota.cpp

@@ -28,14 +28,24 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
     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 = 0x3D0000;  // Korrigierter SPIFFS start address aus partitions.csv
+    static const uint32_t SPIFFS_SIZE = 0x30000;   // Korrigierte SPIFFS size aus partitions.csv
     
-    // Offset-Definitionen aus dem Workflow
+    // Stop all tasks to save resources
-    static const uint32_t BOOTLOADER_OFFSET = 0x1000;
+    if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
-    static const uint32_t PARTITIONS_OFFSET = 0x8000;
+        stopAllTasks();
-    static const uint32_t FIRMWARE_OFFSET = 0x10000;
+        tasksAreStopped = true;
-    static const uint32_t SPIFFS_OFFSET = 0x3D0000;
+    }
-    
+
     if (!index) {
+        // Reset static variables
+        if (spiffsBuffer) {
+            free(spiffsBuffer);
+            spiffsBuffer = nullptr;
+        }
+        
         contentLength = request->contentLength();
         Serial.printf("Update size: %u bytes\n", contentLength);
         
@@ -44,52 +54,136 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
             return;
         }
 
-        // Stop all tasks to save resources
+        if (data[0] == ESP_MAGIC) {
-        if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
+            isFullImage = (contentLength > SPIFFS_START);
-            stopAllTasks();
+            
-            tasksAreStopped = true;
+            if (isFullImage) {
-        }
+                if (!Update.begin(SPIFFS_START, U_FLASH)) {
-
+                    Serial.printf("Not enough space for firmware: %u required\n", SPIFFS_START);
-        isFullImage = (contentLength > SPIFFS_OFFSET);
+                    request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
-        if (!isFullImage) {
+                    return;
-            // Regular firmware update
+                }
-            if (!Update.begin(contentLength)) {
+                
-                Serial.printf("Not enough space: %u required\n", contentLength);
+                spiffsSize = SPIFFS_SIZE;
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
+                spiffsBuffer = (uint8_t*)malloc(spiffsSize);
-                return;
+                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);
+                Serial.println("Full image update started");
+            } else {
+                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\"}");
+                    return;
+                }
+                Serial.println("Firmware update started");
             }
-            Serial.println("Firmware update started");
         } else {
-            // Full image update - start with bootloader
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
-            if (!Update.begin(contentLength, U_FLASH)) {
+            return;
-                Serial.printf("Not enough space for full image: %u required\n", contentLength);
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
-                return;
-            }
-            Serial.println("Full image update started");
         }
         currentOffset = 0;
     }
-
+    
-    // Write data
+    if (isFullImage) {
-    if (Update.write(data, len) != len) {
+        // Firmware Teil
-        String errorMsg = Update.errorString();
+        if (currentOffset < SPIFFS_START) {
-        if (errorMsg != "No Error") {
+            size_t writeLen = min(len, (size_t)(SPIFFS_START - currentOffset));
-            Update.printError(Serial);
+            if (Update.write(data, writeLen) != writeLen) {
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
+                String errorMsg = Update.errorString();
-            return;
+                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 Teil
+        if (currentOffset + len > SPIFFS_START) {
+            uint32_t spiffsOffset = (currentOffset >= SPIFFS_START) ? 
+                                  (currentOffset - SPIFFS_START) : 0;
+            uint32_t dataOffset = (currentOffset < SPIFFS_START) ? 
+                                (SPIFFS_START - currentOffset) : 0;
+            
+            if (spiffsOffset < spiffsSize) {
+                size_t copyLen = min(len - dataOffset, spiffsSize - spiffsOffset);
+                memcpy(spiffsBuffer + spiffsOffset, data + dataOffset, copyLen);
+                Serial.printf("Collecting SPIFFS data: offset=%u, len=%u\n", spiffsOffset, copyLen);
+            }
+        }
+    } else {
+        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");
+                
+                if (SPIFFS.begin(true)) {
+                    SPIFFS.end();
+                }
+                
+                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;
+                }
+                
+                Serial.printf("Writing SPIFFS data: %u bytes\n", spiffsSize);
+                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");
+                
+                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);