docs: update changelog for version 1.2.65

CHANGELOG.md

@@ -1,5 +1,42 @@
 # Changelog
 
+## [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
+
+### Changed
+- update webpages for version 1.2.62
+
+
+## [1.2.61] - 2025-02-20
+### Added
+- update version to 1.2.61 and enhance OTA update error handling
+
+### Changed
+- update webpages for version 1.2.61
+
+
 ## [1.2.60] - 2025-02-20
 ### Added
 - update version to 1.2.60 in platformio configuration

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

src/ota.cpp

@@ -4,8 +4,14 @@
 #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 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;
     
     if (!index) {
         contentLength = request->contentLength();
@@ -16,24 +22,36 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
             return;
         }
 
-        // Determine if this is a full image (firmware + SPIFFS) or just firmware
+        // Prüfe Magic Byte für Image-Typ
-        bool isFullImage = (contentLength > 0x3D0000); // SPIFFS starts at 0x3D0000
+        if (data[0] == ESP_MAGIC) {
+            // Normales Firmware Image oder full.bin
+            isFullImage = (contentLength > 0x3D0000);
             
-        if (!Update.begin(contentLength, isFullImage ? U_FLASH : U_SPIFFS)) {
+            if (!Update.begin(contentLength)) {
                 Serial.printf("Not enough space: %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");
-    }
+        } else {
-    
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
-    // Write chunk to flash
-    if (Update.write(data, len) != len) {
-        Update.printError(Serial);
-        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}");
             return;
         }
+        currentOffset = 0;
+    }
+    
+    // Schreibe Daten
+    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)) {
@@ -42,8 +60,15 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
             delay(1000);
             ESP.restart();
         } else {
+            String errorMsg = Update.errorString();
+            if (errorMsg != "No Error") {
                 Update.printError(Serial);
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
+                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();
+            }
         }
     }
 }