docs: update changelog for version 1.2.63

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [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

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.61</span></h1>
+                <h1>FilaMan<span class="version">v1.2.63</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.61</span></h1>
+                <h1>FilaMan<span class="version">v1.2.63</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.61</span></h1>
+                <h1>FilaMan<span class="version">v1.2.63</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.61</span></h1>
+                <h1>FilaMan<span class="version">v1.2.63</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.61</span></h1>
+                <h1>FilaMan<span class="version">v1.2.63</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.61</span></h1>
+                <h1>FilaMan<span class="version">v1.2.63</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.61</span></h1>
+                <h1>FilaMan<span class="version">v1.2.63</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.61"
+version = "1.2.63"
 
 [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,35 +22,34 @@ 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
-        if (isFullImage) {
+            isFullImage = (contentLength > 0x3D0000);
-            // For full images, we need to make sure we have enough space and properly partition it
+            
-            if (!Update.begin(ESP.getFreeSketchSpace(), U_FLASH)) {
+            if (!Update.begin(contentLength)) {
-                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
-            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");
+        } else {
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
+            return;
         }
-        
+        currentOffset = 0;
-        Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
     }
     
-    // Write chunk to flash
+    // Schreibe Daten
     if (Update.write(data, len) != len) {
         Update.printError(Serial);
         String errorMsg = Update.errorString();
         request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
         return;
     }
+    
+    currentOffset += len;
 
     if (final) {
         if (Update.end(true)) {