docs: update changelog for version 1.2.75

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.2.75] - 2025-02-20
+### Changed
+- update webpages for version v1.2.75
+- simplify OTA update handling by removing unnecessary variables and improving error reporting
+
+
+## [1.2.74] - 2025-02-20
+### Changed
+- update webpages for version v1.2.74
+- enhance OTA update process with improved handling of full image updates and SPIFFS data
+
+
 ## [1.2.73] - 2025-02-20
 ### Changed
 - update webpages for version v1.2.73

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.73</span></h1>
+                <h1>FilaMan<span class="version">v1.2.75</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.73</span></h1>
+                <h1>FilaMan<span class="version">v1.2.75</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.73</span></h1>
+                <h1>FilaMan<span class="version">v1.2.75</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.73</span></h1>
+                <h1>FilaMan<span class="version">v1.2.75</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.73</span></h1>
+                <h1>FilaMan<span class="version">v1.2.75</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.73</span></h1>
+                <h1>FilaMan<span class="version">v1.2.75</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.73</span></h1>
+                <h1>FilaMan<span class="version">v1.2.75</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.73"
+version = "1.2.75"
 
 [env:esp32dev]
 platform = espressif32
@@ -59,6 +59,12 @@ build_flags =
     -DOTA_PARTITION_SUBTYPE=0x10
     -DPARTITION_TABLE_OFFSET=0x8000
     -DPARTITION_TABLE_SIZE=0x1000
+    -DCONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=1
+    -DCONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=1
+    -DCONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=1
+    -DCONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x1000
+    -DCONFIG_PARTITION_TABLE_OFFSET=0x8000
+    -DCONFIG_PARTITION_TABLE_MD5=y
     
 extra_scripts = 
     scripts/extra_script.py
@@ -66,7 +72,6 @@ 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

@@ -1,48 +0,0 @@
-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

@@ -7,13 +7,10 @@
 #include "scale.h"
 #include "nfc.h"
 
-// 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
     Serial.println("Stopping RFID Reader");
     if (RfidReaderTask) vTaskSuspend(RfidReaderTask);
     Serial.println("Stopping Bambu");
@@ -25,20 +22,9 @@ void stopAllTasks() {
 }
 
 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;
-    
-    // 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) {
-        contentLength = request->contentLength();
-        Serial.printf("Update size: %u bytes (0x%X)\n", contentLength, contentLength);
-        
-        if (contentLength == 0) {
+        Serial.printf("Update Start: %s\n", filename.c_str());
+        if (request->contentLength() == 0) {
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
             return;
         }
@@ -48,77 +34,28 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
             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\"}");
+        if (!Update.begin(UPDATE_SIZE_UNKNOWN)) {
+            Update.printError(Serial);
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA could not begin\"}");
             return;
         }
-            
-            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.printf("Firmware update started (size: 0x%X)\n", contentLength);
-        } else {
-            // 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 (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 + "\"}");
+        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA write failed\"}");
         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.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 {
-            String errorMsg = Update.errorString();
-            if (errorMsg != "No Error") {
+        if (!Update.end(true)) {
             Update.printError(Serial);
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
-            } else {
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA end failed\"}");
+            return;
+        }
         request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
-                delay(1000);
+        delay(500);
         ESP.restart();
     }
-        }
-    }
 }