docs: update changelog for version 1.2.73

CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## [1.2.73] - 2025-02-20
+### Changed
+- update webpages for version v1.2.73
+- improve OTA update process with enhanced size checks and progress logging
+
+### Fixed
+- enhance OTA update process with improved size checks and debugging output
+
+
+## [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
+
+### Changed
+- update webpages for version v1.2.71
+
+
+## [1.2.70] - 2025-02-20
+### Added
+- add logging to stopAllTasks for better debugging
+
+### Changed
+- update webpages for version v1.2.70
+
+
+## [1.2.69] - 2025-02-20
+### Changed
+- update webpages for version v1.2.69
+
+
 ## [1.2.68] - 2025-02-20
 ### Added
 - add task handles for BambuMqttTask and ScaleTask; rename stopTasks to stopAllTasks

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.68</span></h1>
+                <h1>FilaMan<span class="version">v1.2.73</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.68</span></h1>
+                <h1>FilaMan<span class="version">v1.2.73</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.68</span></h1>
+                <h1>FilaMan<span class="version">v1.2.73</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.68</span></h1>
+                <h1>FilaMan<span class="version">v1.2.73</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.68</span></h1>
+                <h1>FilaMan<span class="version">v1.2.73</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.68</span></h1>
+                <h1>FilaMan<span class="version">v1.2.73</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.68</span></h1>
+                <h1>FilaMan<span class="version">v1.2.73</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.68"
+version = "1.2.73"
 
 [env:esp32dev]
 platform = espressif32
@@ -66,6 +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
 
 ; Remove or comment out the targets line
 ;targets = buildfs, build

scripts/create_full_bin.py

@@ -0,0 +1,48 @@
+import os
+import shutil
+from platformio import util
+
+Import("env")
+
+def create_full_bin(source, target, env):
+    # Get paths
+    firmware_path = str(target[0])
+    build_dir = os.path.dirname(firmware_path)
+    project_dir = env.get("PROJECT_DIR")
+    
+    # Create full binary
+    firmware_name = os.path.basename(firmware_path)
+    spiffs_bin = os.path.join(build_dir, "spiffs.bin")
+    full_bin = os.path.join(build_dir, "full.bin")
+    
+    print("Creating full.bin...")
+    
+    # Check if files exist
+    if not os.path.exists(firmware_path):
+        print("Error: Firmware binary not found!")
+        return
+    if not os.path.exists(spiffs_bin):
+        print("Error: SPIFFS binary not found!")
+        return
+    
+    # Calculate padding size
+    firmware_size = os.path.getsize(firmware_path)
+    padding_size = 0x3D0000 - firmware_size  # SPIFFS start address - firmware size
+    
+    # Create full binary
+    with open(full_bin, 'wb') as outfile:
+        # Copy firmware
+        with open(firmware_path, 'rb') as f:
+            outfile.write(f.read())
+        
+        # Add padding
+        outfile.write(b'\xFF' * padding_size)
+        
+        # Copy SPIFFS
+        with open(spiffs_bin, 'rb') as f:
+            outfile.write(f.read())
+    
+    print(f"Created full.bin ({os.path.getsize(full_bin)} bytes)")
+
+# Register the callback
+env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", create_full_bin)

src/ota.cpp

@@ -10,161 +10,105 @@
 // Magic byte patterns für verschiedene Image-Typen
 const uint8_t FIRMWARE_MAGIC = 0xE9;
 const uint8_t ESP_MAGIC = 0xE9;
+static bool tasksAreStopped = false;
 
 void stopAllTasks() {
     // Stop all tasks
-    vTaskSuspend(RfidReaderTask);
-    vTaskSuspend(BambuMqttTask);
-    vTaskSuspend(ScaleTask);
-    //vTaskDelay(100 / portTICK_PERIOD_MS);
+    Serial.println("Stopping RFID Reader");
+    if (RfidReaderTask) vTaskSuspend(RfidReaderTask);
+    Serial.println("Stopping Bambu");
+    if (BambuMqttTask) vTaskSuspend(BambuMqttTask);
+    Serial.println("Stopping Scale");
+    if (ScaleTask) vTaskSuspend(ScaleTask);
+    vTaskDelay(100 / portTICK_PERIOD_MS);
+    Serial.println("All tasks stopped");
 }
 
 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
     
-    stopAllTasks();
-
+    // Flash layout constants from partitions.csv
+    static const uint32_t FLASH_SIZE = 0x400000;    // 4MB total
+    static const uint32_t APP_SIZE = 0x1E0000;      // Size per app partition
+    static const uint32_t SPIFFS_OFFSET = 0x3D0000; // SPIFFS start
+    
     if (!index) {
-        // Reset static variables
-        if (spiffsBuffer) {
-            free(spiffsBuffer);
-            spiffsBuffer = nullptr;
-        }
-        
         contentLength = request->contentLength();
-        Serial.printf("Update size: %u bytes\n", contentLength);
+        Serial.printf("Update size: %u bytes (0x%X)\n", contentLength, contentLength);
         
         if (contentLength == 0) {
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
             return;
         }
 
-        if (data[0] == ESP_MAGIC) {
-            isFullImage = (contentLength > 0x3D0000);
+        if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
+            stopAllTasks();
+            tasksAreStopped = true;
+        }
+
+        isFullImage = (contentLength >= SPIFFS_OFFSET);
+        
+        if (!isFullImage) {
+            // Regular firmware update must not exceed app partition size
+            if (contentLength > APP_SIZE) {
+                Serial.printf("Firmware too large: 0x%X > 0x%X\n", contentLength, APP_SIZE);
+                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Firmware too large\"}");
+                return;
+            }
             
-            // Korrektur: Bei full.bin die gesamte Größe verwenden
-            if (!Update.begin(contentLength, U_FLASH)) {
-                Serial.printf("Not enough space: %u required\n", contentLength);
+            if (!Update.begin(contentLength)) {
+                Serial.printf("Not enough space for firmware: %u required\n", contentLength);
                 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
-            }
+            Serial.printf("Firmware update started (size: 0x%X)\n", contentLength);
         } else {
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
-            return;
+            // Full image update
+            if (contentLength > FLASH_SIZE) {
+                Serial.printf("Image too large: 0x%X > 0x%X\n", contentLength, FLASH_SIZE);
+                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Image too large\"}");
+                return;
+            }
+            
+            if (!Update.begin(FLASH_SIZE, U_FLASH)) {
+                Serial.println("Could not begin full image update");
+                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Could not start full update\"}");
+                return;
+            }
+            Serial.printf("Full image update started (size: 0x%X)\n", contentLength);
         }
         currentOffset = 0;
     }
-    
-    if (isFullImage) {
-        // Zuerst vollständiges Firmware-Update durchführen
-        if (Update.write(data, len) != len) {
-            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;
-            }
+
+    if (Update.write(data, len) != len) {
+        String errorMsg = Update.errorString();
+        if (errorMsg != "No Error") {
+            Update.printError(Serial);
+            Serial.printf("Error at offset: 0x%X of 0x%X bytes\n", currentOffset, contentLength);
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
+            return;
         }
     }
     
+    // Progress logging
+    if ((currentOffset % 0x40000) == 0) { // Log every 256KB
+        Serial.printf("Update progress: 0x%X of 0x%X bytes (%.1f%%)\n", 
+            currentOffset, 
+            contentLength, 
+            (currentOffset * 100.0) / contentLength);
+    }
+    
     currentOffset += len;
-
+    
     if (final) {
         if (Update.end(true)) {
-            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();
-            }
-            
+            Serial.printf("Update complete: 0x%X bytes written\n", currentOffset);
             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);

src/ota.h

@@ -3,6 +3,12 @@
 
 #include <ESPAsyncWebServer.h>
 
+// Update size unknown constant, falls nicht bereits definiert
+#ifndef UPDATE_SIZE_UNKNOWN
+#define UPDATE_SIZE_UNKNOWN 0xFFFFFFFF
+#endif
+
+void stopAllTasks();
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
 
 #endif

src/wlan.cpp

@@ -12,7 +12,7 @@ bool wm_nonblocking = false;
 void initWiFi() {
     WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
   
-    esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm
+    //esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm
   
     if(wm_nonblocking) wm.setConfigPortalBlocking(false);
     wm.setConfigPortalTimeout(320); // Portal nach 5min schließen