docs: update changelog for version 1.2.2

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [1.2.2] - 2025-02-18
+### Added
+- update version to 1.2.2; change OTA upgrade link in HTML files; enhance OTA upload handling with progress updates and JSON responses
+- implement OTA update functionality with web interface; update partition settings and build configuration
+- remove unused OTA server setup and related includes; update platformio.ini dependencies
+- adjust weight counter threshold and optimize delay in RFID scanning; include scale header in NFC module
+- update version to v1.2.1 and change upgrade link to OTA in HTML files; modify updateSpoolTagId function to return boolean
+
+
 ## [1.2.0] - 2025-02-17
 ### Added
 - implement OTA functionality and update build scripts; change upgrade link to OTA in HTML

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.0</span></h1>
+                <h1>FilaMan<span class="version">v1.2.1</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -21,7 +21,7 @@
             <a href="/waage">Scale</a>
             <a href="/spoolman">Spoolman/Bambu</a>
             <a href="/about">About</a>
-            <a href="/ota">Upgrade</a>
+            <a href="/upgrade">Upgrade</a>
         </nav>
         <div class="status-container">
             <div class="status-item">

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.0</span></h1>
+                <h1>FilaMan<span class="version">v1.2.1</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.0</span></h1>
+                <h1>FilaMan<span class="version">v1.2.1</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.0</span></h1>
+                <h1>FilaMan<span class="version">v1.2.1</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/style.css

@@ -1014,3 +1014,77 @@ input[type="submit"]:disabled,
     vertical-align: middle;
     margin-left: 0.5rem;
 }
+
+.progress-container {
+    width: 100%;
+    margin: 20px 0;
+    display: none;
+    background: #f0f0f0;
+    border-radius: 4px;
+    overflow: hidden;
+}
+.progress-bar {
+    width: 0%;
+    height: 24px;
+    background-color: #4CAF50;
+    text-align: center;
+    line-height: 24px;
+    color: white;
+    transition: width 0.3s ease-in-out;
+    font-weight: bold;
+}
+.status {
+    margin: 10px 0;
+    padding: 15px;
+    border-radius: 4px;
+    display: none;
+}
+.error { 
+    background-color: #ffebee; 
+    color: #c62828; 
+    border: 1px solid #ef9a9a;
+}
+.success { 
+    background-color: #e8f5e9; 
+    color: #2e7d32; 
+    border: 1px solid #a5d6a7;
+}
+.update-form {
+    background: var(--primary-color);
+    padding: 20px;
+    border-radius: 8px;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+    margin: 0 auto;
+    width: 400px;
+}
+.update-form input[type="file"] {
+    margin-bottom: 15px;
+    width: 80%;
+    padding: 8px;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+}
+.update-form input[type="submit"] {
+    background-color: #4CAF50;
+    color: white;
+    padding: 10px 20px;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    font-size: 16px;
+}
+.update-form input[type="submit"]:hover {
+    background-color: #45a049;
+}
+.update-form input[type="submit"]:disabled {
+    background-color: #cccccc;
+    cursor: not-allowed;
+}
+.warning {
+    background-color: var(--primary-color);
+    border: 1px solid #ffe0b2;
+    color: #e65100;
+    padding: 15px;
+    margin: 20px 0;
+    border-radius: 4px;
+}

html/upgrade.html

@@ -0,0 +1,142 @@
+
+<!-- head --><!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>FilaMan - Filament Management Tool</title>
+    <link rel="icon" type="image/png" href="/favicon.ico">
+    <link rel="stylesheet" href="style.css">
+</head>
+<body>
+    <div class="navbar">
+        <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.1</span></h1>
+                <h4>Filament Management Tool</h4>
+            </div>
+        </div>
+        <nav style="display: flex; gap: 1rem;">
+            <a href="/">Start</a>
+            <a href="/waage">Scale</a>
+            <a href="/spoolman">Spoolman/Bambu</a>
+            <a href="/about">About</a>
+            <a href="/upgrade">Upgrade</a>
+        </nav>
+        <div class="status-container">
+            <div class="status-item">
+                <span class="status-dot" id="bambuDot"></span>B
+            </div>
+            <div class="status-item">
+                <span class="status-dot" id="spoolmanDot"></span>S
+            </div>
+            <div class="ram-status" id="ramStatus"></div>
+        </div>
+    </div>
+
+<!-- head -->
+    
+    <div class="content">
+        <h1>Firmware Upgrade</h1>
+
+        <div class="warning">
+            <strong>Warning:</strong> Please do not turn off or restart the device during the update. 
+                        Configuration files will be automatically backed up and restored after the update.
+        </div>
+
+        
+        <div class="update-form" style="align-items: center;">
+            <form id="updateForm" enctype='multipart/form-data' style="text-align: center;"></form>
+                <input type='file' name='update' accept='.bin' required>
+                <input type='submit' value='Firmware Update starten'>
+            </form>
+        </div>
+
+        <div class="progress-container">
+            <div class="progress-bar">0%</div>
+        </div>
+        <div class="status"></div>
+    </div>
+
+    <script>
+        document.getElementById('updateForm').addEventListener('submit', async (e) => {
+            e.preventDefault();
+            const form = e.target;
+            const file = form.update.files[0];
+            const formData = new FormData();
+            formData.append('update', file);
+
+            const progress = document.querySelector('.progress-bar');
+            const progressContainer = document.querySelector('.progress-container');
+            const status = document.querySelector('.status');
+            
+            progressContainer.style.display = 'block';
+            status.style.display = 'none';
+            status.className = 'status';
+            form.querySelector('input[type=submit]').disabled = true;
+
+            const xhr = new XMLHttpRequest();
+            xhr.open('POST', '/update', true);
+
+            xhr.upload.onprogress = (e) => {
+                if (e.lengthComputable) {
+                    const percentComplete = (e.loaded / e.total) * 100;
+                    progress.style.width = percentComplete + '%';
+                    progress.textContent = Math.round(percentComplete) + '%';
+                }
+            };
+
+            xhr.onload = function() {
+                try {
+                    let response = this.responseText;
+                    try {
+                        // Versuche als JSON zu parsen
+                        const jsonResponse = JSON.parse(response);
+                        response = jsonResponse.message;
+                        
+                        if (jsonResponse.restart) {
+                            // Wenn Gerät neustartet, warte und lade dann neu
+                            status.textContent = response + " Weiterleitung in 5 Sekunden...";
+                            setTimeout(() => {
+                                window.location.href = '/';
+                            }, 5000);
+                        }
+                    } catch (e) {
+                        // Wenn kein JSON, nutze response als Text
+                        if (!isNaN(response)) {
+                            // Wenn es eine Zahl ist, update den Fortschritt
+                            const percent = parseInt(response);
+                            progress.style.width = percent + '%';
+                            progress.textContent = percent + '%';
+                            return;
+                        }
+                    }
+                    
+                    status.textContent = response;
+                    status.classList.add(xhr.status === 200 ? 'success' : 'error');
+                    status.style.display = 'block';
+                    
+                    if (xhr.status !== 200) {
+                        form.querySelector('input[type=submit]').disabled = false;
+                    }
+                } catch (error) {
+                    status.textContent = 'Fehler: ' + error.message;
+                    status.classList.add('error');
+                    status.style.display = 'block';
+                    form.querySelector('input[type=submit]').disabled = false;
+                }
+            };
+
+            xhr.onerror = function() {
+                status.textContent = 'Update fehlgeschlagen: Netzwerkfehler';
+                status.classList.add('error');
+                status.style.display = 'block';
+                form.querySelector('input[type=submit]').disabled = false;
+            };
+
+            xhr.send(formData);
+        });
+    </script>
+</body>
+</html>

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.0</span></h1>
+                <h1>FilaMan<span class="version">v1.2.1</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.0</span></h1>
+                <h1>FilaMan<span class="version">v1.2.1</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

partitions.csv

@@ -1,5 +1,6 @@
-# Name,   Type, SubType, Offset,   Size,     Flags
+# Name,   Type,  SubType,    Offset,    Size,     Flags
-nvs,      data, nvs,     0x9000,   0x5000,
+nvs,      data,  nvs,       0x9000,   0x5000,
-otadata,  data, ota,     0xe000,   0x2000,
+otadata,  data,  ota,       0xe000,   0x2000,
-app0,     app,  ota_0,   0x10000,  0x280000,
+app0,     app,   factory,   0x10000,  0x1E0000,
-spiffs,   data, spiffs,  0x290000, 0x170000,
+app1,     app,   ota_0,     0x1F0000, 0x1E0000,
+spiffs,   data,  spiffs,    0x3D0000, 0x30000,

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.2.0"
+version = "1.2.2"
 
 [env:esp32dev]
 platform = espressif32
@@ -19,7 +19,6 @@ monitor_speed = 115200
 
 lib_deps =
     tzapu/WiFiManager @ ^2.0.17
-    #me-no-dev/ESP Async WebServer @ ^1.2.4
     https://github.com/me-no-dev/ESPAsyncWebServer.git#master
     me-no-dev/AsyncTCP @ ^1.1.1
     bogde/HX711 @ ^0.7.5
@@ -29,16 +28,14 @@ lib_deps =
     bblanchon/ArduinoJson @ ^7.3.0
     knolleary/PubSubClient @ ^2.8
     digitaldragon/SSLClient @ ^1.3.2
-    ipdotsetaf/ESPAsyncHTTPUpdateServer @ ^2.0.0
     
 ; Enable SPIFFS upload
 board_build.filesystem = spiffs
 ; Update partition settings
 board_build.partitions = partitions.csv
 board_upload.flash_size = 4MB
-; Remove these as they're now defined in partitions.csv
+board_build.flash_mode = dio
-; board_build.spiffs.partition = 2M
+board_upload.flash_freq = "40m"
-; board_build.spiffs.upload_size = 2M
 
 build_flags = 
     -Os
@@ -47,6 +44,14 @@ build_flags =
     -DNDEBUG
     -mtext-section-literals
     '-D VERSION="${common.version}"'
+    -DASYNCWEBSERVER_REGEX
+    -DCORE_DEBUG_LEVEL=1
+    -DCONFIG_ARDUHAL_LOG_COLORS=1
+    -DOTA_DEBUG=1
+    -DARDUINO_RUNNING_CORE=1
+    -DARDUINO_EVENT_RUNNING_CORE=1
+    -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
+    -DCONFIG_ESP32_PANIC_PRINT_REBOOT
     
 extra_scripts = 
     scripts/extra_script.py

src/api.cpp

@@ -175,20 +175,20 @@ void sendToApi(void *parameter) {
     vTaskDelete(NULL);
 }
 
-uint8_t updateSpoolTagId(String uidString, const char* payload) {
+bool updateSpoolTagId(String uidString, const char* payload) {
     JsonDocument doc;
     DeserializationError error = deserializeJson(doc, payload);
     
     if (error) {
         Serial.print("Fehler beim JSON-Parsing: ");
         Serial.println(error.c_str());
-        return 0;
+        return false;
     }
     
     // Überprüfe, ob die erforderlichen Felder vorhanden sind
     if (!doc.containsKey("sm_id") || doc["sm_id"] == "") {
         Serial.println("Keine Spoolman-ID gefunden.");
-        return 0;
+        return false;
     }
 
     String spoolsUrl = spoolmanUrl + apiUrl + "/spool/" + doc["sm_id"].as<String>();
@@ -207,7 +207,7 @@ uint8_t updateSpoolTagId(String uidString, const char* payload) {
     SendToApiParams* params = new SendToApiParams();
     if (params == nullptr) {
         Serial.println("Fehler: Kann Speicher für Task-Parameter nicht allokieren.");
-        return 0;
+        return false;
     }
     params->httpType = "PATCH";
     params->spoolsUrl = spoolsUrl;
@@ -223,7 +223,7 @@ uint8_t updateSpoolTagId(String uidString, const char* payload) {
         NULL                      // Task-Handle (nicht benötigt)
     );
 
-    return 1;
+    return true;
 }
 
 uint8_t updateSpoolWeight(String spoolId, uint16_t weight) {

src/api.h

@@ -17,7 +17,7 @@ bool checkSpoolmanExtraFields(); // Neue Funktion zum Überprüfen der Extrafeld
 JsonDocument fetchSpoolsForWebsite(); // API-Funktion für die Webseite
 JsonDocument fetchAllSpoolsInfo();
 void sendAmsData(AsyncWebSocketClient *client); // Neue Funktion zum Senden von AMS-Daten
-uint8_t updateSpoolTagId(String uidString, const char* payload); // Neue Funktion zum Aktualisieren eines Spools
+bool updateSpoolTagId(String uidString, const char* payload); // Neue Funktion zum Aktualisieren eines Spools
 uint8_t updateSpoolWeight(String spoolId, uint16_t weight); // Neue Funktion zum Aktualisieren des Gewichts
 bool initSpoolman(); // Neue Funktion zum Initialisieren von Spoolman
 

src/main.cpp

@@ -128,6 +128,7 @@ void loop() {
       weightSend = 0;
     }
   }
+
   // reset weight counter after writing tag
   if (currentMillis - lastWeightReadTime >= weightReadInterval && hasReadRfidTag > 1)
   {
@@ -137,7 +138,7 @@ void loop() {
   lastWeight = weight;
 
   // Wenn ein Tag mit SM id erkannte wurde und der Waage Counter anspricht an SM Senden
-  if (spoolId != "" && weigthCouterToApi > 5 && weightSend == 0 && hasReadRfidTag == 1) {
+  if (spoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && hasReadRfidTag == 1) {
     oledShowIcon("loading");
     if (updateSpoolWeight(spoolId, weight)) 
     {

src/nfc.cpp

@@ -6,6 +6,7 @@
 #include "website.h"
 #include "api.h"
 #include "esp_task_wdt.h"
+#include "scale.h"
 
 //Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
 Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
@@ -93,14 +94,6 @@ bool formatNdefTag() {
   }
 
 uint8_t ntag2xx_WriteNDEF(const char *payload) {
-  /*
-  if (!formatNdefTag()) {
-    Serial.println("Fehler beim Formatieren des NDEF-Tags.");
-    hasReadRfidTag = 2;
-    return 0;
-  }
-  */
-
   uint8_t tagSize = 240; // 144 bytes is maximum for NTAG213
   Serial.print("Tag Size: ");Serial.println(tagSize);
 
@@ -137,9 +130,6 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
     return 0;
   }
 
-  //Serial.println();
-  //Serial.print("Header Size: ");Serial.println(sizeof(pageHeader));
-
   // Kombiniere Header und Payload
   int totalSize = sizeof(pageHeader) + len;
   uint8_t* combinedData = (uint8_t*) malloc(totalSize);
@@ -149,37 +139,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
     return 0;
   }
 
-  // Überprüfe die Kombination von Header und Payload
-  /*
-  Serial.print("Header: ");
-  for (int i = 0; i < sizeof(pageHeader); i++) {
-    Serial.print(pageHeader[i], HEX);
-    Serial.print(" ");
-  }
-  Serial.println();
-
-  Serial.print("Payload: ");
-  for (int i = 0; i < len; i++) {
-    Serial.print(payload[i], HEX);
-    Serial.print(" ");
-  }
-  Serial.println();
-  */
-
   // Kombiniere Header und Payload
   memcpy(combinedData, pageHeader, sizeof(pageHeader));
   memcpy(&combinedData[sizeof(pageHeader)], payload, len);
 
-  // Überprüfe die Kombination von Header und Payload
-  /*
-  Serial.print("Kombinierte Daten: ");
-  for (int i = 0; i < totalSize; i++) {
-    Serial.print(combinedData[i], HEX);
-    Serial.print(" ");
-  }
-  Serial.println();
-  */
-
   // Schreibe die Seiten
   uint8_t a = 0;
   uint8_t i = 0;
@@ -188,21 +151,9 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
     int bytesToWrite = (totalSize < 4) ? totalSize : 4;
     memcpy(pageBuffer, combinedData + a, bytesToWrite);
 
-    // Überprüfe die Schreibung der Seiten
+    //uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
-    /*
+    //uint8_t uidLength;
-    Serial.print("Seite ");
+    //nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 100);
-    Serial.print(i);
-    Serial.print(": ");
-    for (int j = 0; j < bytesToWrite; j++) {
-      Serial.print(pageBuffer[j], HEX);
-      Serial.print(" ");
-    }
-    Serial.println();
-    */
-    uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
-    uint8_t uidLength;
-    nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500);
-    //Serial.print("Schreibe Seite: ");Serial.println(i);
 
     if (!(nfc.ntag2xx_WritePage(4+i, pageBuffer))) 
     {
@@ -211,8 +162,6 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
       return 0;
     }
 
-    //Serial.print("Seite geschrieben: ");Serial.println(i);
-
     yield();
     //esp_task_wdt_reset();
 
@@ -285,11 +234,15 @@ void writeJsonToTag(void *parameter) {
 
   // Gib die erstellte NDEF-Message aus
   Serial.println("Erstelle NDEF-Message...");
+  Serial.println(payload);
+
   hasReadRfidTag = 3;
   vTaskSuspend(RfidReaderTask);
+  vTaskDelay(500 / portTICK_PERIOD_MS);
   //pauseBambuMqttTask = true;
   // aktualisieren der Website wenn sich der Status ändert
   sendNfcData(nullptr);
+  oledShowMessage("Waiting for NFC-Tag");
 
   // Wait 10sec for tag
   uint8_t success = 0;
@@ -326,13 +279,23 @@ void writeJsonToTag(void *parameter) {
         Serial.println("NDEF-Message erfolgreich auf den Tag geschrieben");
         //oledShowMessage("NFC-Tag written");
         oledShowIcon("success");
-        vTaskDelay(2000 / portTICK_PERIOD_MS);
+        vTaskDelay(1000 / portTICK_PERIOD_MS);
         hasReadRfidTag = 5;
         // aktualisieren der Website wenn sich der Status ändert
         sendNfcData(nullptr);
-        vTaskResume(RfidReaderTask);
         pauseBambuMqttTask = false;
-        updateSpoolTagId(uidString, payload);
+        
+        if (updateSpoolTagId(uidString, payload)) {
+          uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
+          uint8_t uidLength;
+          oledShowIcon("success");
+          while (nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 500)) {
+            yield();
+          }
+        }
+          
+        vTaskResume(RfidReaderTask);
+        vTaskDelay(500 / portTICK_PERIOD_MS);        
     } 
     else 
     {
@@ -362,15 +325,18 @@ void writeJsonToTag(void *parameter) {
 void startWriteJsonToTag(const char* payload) {
   char* payloadCopy = strdup(payload);
   
-  // Erstelle die Task
+  // Task nicht mehrfach starten
-  xTaskCreate(
+  if (hasReadRfidTag != 3) {
-      writeJsonToTag,        // Task-Funktion
+    // Erstelle die Task
-      "WriteJsonToTagTask",       // Task-Name
+    xTaskCreate(
-      4096,                        // Stackgröße in Bytes
+        writeJsonToTag,        // Task-Funktion
-      (void*)payloadCopy,         // Parameter
+        "WriteJsonToTagTask",       // Task-Name
-      rfidWriteTaskPrio,           // Priorität
+        4096,                        // Stackgröße in Bytes
-      NULL                         // Task-Handle (nicht benötigt)
+        (void*)payloadCopy,         // Parameter
-  );
+        rfidWriteTaskPrio,           // Priorität
+        NULL                         // Task-Handle (nicht benötigt)
+    );
+  }
 }
 
 void scanRfidTask(void * parameter) {
@@ -397,7 +363,7 @@ void scanRfidTask(void * parameter) {
         hasReadRfidTag = 6;
 
         oledShowIcon("transfer");
-        vTaskDelay(1000 / portTICK_PERIOD_MS);
+        vTaskDelay(500 / portTICK_PERIOD_MS);
 
         if (uidLength == 7)
         {

src/ota.cpp

@@ -1,11 +1,221 @@
 #include <Arduino.h>
 #include "ota.h"
-#include <ESPAsyncWebServer.h>
+#include <Update.h>
-#include <ESPAsyncHTTPUpdateServer.h>
+#include <SPIFFS.h>
+#include "commonFS.h"
+#include <esp_task_wdt.h>
+#include <esp_int_wdt.h>
+#include <esp_pthread.h>
+#include <esp_ota_ops.h>
 
-ESPAsyncHTTPUpdateServer updateServer;
+// Reduzierter Puffer für Dateioperationen
+const size_t BUFFER_SIZE = 128;
+const size_t MIN_FREE_HEAP = 32768; // 32KB minimum free heap
 
-void setupOTA(AsyncWebServer &server) {
+// Files to backup before update
-    updateServer.setup(&server, "/ota", "admin", "admin");
+const char* CONFIG_FILES[] = {
-    //updateServer.setup(&server);
+    "/bambu_credentials.json",
+    "/spoolman_url.json"
+};
+const int CONFIG_FILES_COUNT = sizeof(CONFIG_FILES) / sizeof(CONFIG_FILES[0]);
+
+bool backupConfigs() {
+    if (!SPIFFS.begin(true)) {
+        Serial.println("Failed to mount SPIFFS");
+        return false;
+    }
+
+    for (int i = 0; i < CONFIG_FILES_COUNT; i++) {
+        if (SPIFFS.exists(CONFIG_FILES[i])) {
+            String backupFile = String(CONFIG_FILES[i]) + ".bak";
+            
+            if (SPIFFS.exists(backupFile)) {
+                SPIFFS.remove(backupFile);
+            }
+            
+            File sourceFile = SPIFFS.open(CONFIG_FILES[i], "r");
+            File destFile = SPIFFS.open(backupFile, "w");
+            
+            if (!sourceFile || !destFile) {
+                Serial.printf("Failed to open files for backup: %s\n", CONFIG_FILES[i]);
+                return false;
+            }
+
+            // Verwenden Sie einen kleineren Puffer
+            uint8_t* buf = (uint8_t*)malloc(BUFFER_SIZE);
+            if (!buf) {
+                Serial.println("Failed to allocate buffer");
+                sourceFile.close();
+                destFile.close();
+                return false;
+            }
+
+            size_t len = 0;
+            bool success = true;
+            while ((len = sourceFile.read(buf, BUFFER_SIZE)) > 0) {
+                if (destFile.write(buf, len) != len) {
+                    Serial.println("Write failed");
+                    success = false;
+                    break;
+                }
+            }
+
+            free(buf);
+            sourceFile.close();
+            destFile.close();
+
+            if (!success) {
+                return false;
+            }
+        }
+    }
+    return true;
 }
+
+bool restoreConfigs() {
+    if (!SPIFFS.begin(true)) {
+        Serial.println("Failed to mount SPIFFS");
+        return false;
+    }
+
+    bool success = true;
+    for (int i = 0; i < CONFIG_FILES_COUNT; i++) {
+        String backupFile = String(CONFIG_FILES[i]) + ".bak";
+        if (SPIFFS.exists(backupFile)) {
+            if (SPIFFS.exists(CONFIG_FILES[i])) {
+                SPIFFS.remove(CONFIG_FILES[i]);
+            }
+            
+            File sourceFile = SPIFFS.open(backupFile, "r");
+            File destFile = SPIFFS.open(CONFIG_FILES[i], "w");
+            
+            if (!sourceFile || !destFile) {
+                Serial.printf("Failed to open files for restore: %s\n", CONFIG_FILES[i]);
+                success = false;
+                continue;
+            }
+
+            // Verwenden Sie einen kleineren Puffer
+            uint8_t* buf = (uint8_t*)malloc(BUFFER_SIZE);
+            if (!buf) {
+                Serial.println("Failed to allocate buffer");
+                sourceFile.close();
+                destFile.close();
+                success = false;
+                continue;
+            }
+
+            size_t len = 0;
+            while ((len = sourceFile.read(buf, BUFFER_SIZE)) > 0) {
+                if (destFile.write(buf, len) != len) {
+                    Serial.println("Write failed");
+                    success = false;
+                    break;
+                }
+            }
+
+            free(buf);
+            sourceFile.close();
+            destFile.close();
+            
+            SPIFFS.remove(backupFile);
+        }
+    }
+    return success;
+}
+
+void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
+    static bool updateStarted = false;
+    static size_t totalBytes = 0;
+    static size_t totalSize = 0;
+
+    if (!index) {
+        updateStarted = false;
+        totalBytes = 0;
+        totalSize = request->contentLength();
+
+        // Check minimum heap size
+        if (ESP.getFreeHeap() < MIN_FREE_HEAP) {
+            request->send(500, "text/plain", "Not enough memory available");
+            return;
+        }
+
+        if (totalSize == 0) {
+            request->send(400, "text/plain", "Invalid file size");
+            return;
+        }
+
+        Serial.printf("Update size: %u bytes\n", totalSize);
+        Serial.printf("Free space: %u bytes\n", ESP.getFreeSketchSpace());
+        Serial.printf("Free heap: %u bytes\n", ESP.getFreeHeap());
+
+        // Backup configs first
+        if (!backupConfigs()) {
+            request->send(500, "text/plain", "Failed to backup configuration");
+            return;
+        }
+
+        // Close all files and unmount SPIFFS
+        SPIFFS.end();
+
+        // Begin update with minimal configuration
+        if (!Update.begin(totalSize)) {
+            Serial.printf("Update.begin failed: %s\n", Update.errorString());
+            request->send(500, "text/plain", "Failed to start update");
+            return;
+        }
+
+        updateStarted = true;
+        Serial.println("Update process started");
+        
+        // Send initial progress
+        request->send(200, "text/plain", "0");
+    }
+
+    if (!updateStarted) {
+        request->send(500, "text/plain", "Update not properly started");
+        return;
+    }
+
+    // Write update data
+    if (Update.write(data, len) != len) {
+        Serial.printf("Update.write failed: %s\n", Update.errorString());
+        Update.abort();
+        request->send(500, "text/plain", "Error during update");
+        return;
+    }
+
+    totalBytes += len;
+    
+    // Send progress update
+    if (!final) {
+        int progress = (totalBytes * 100) / totalSize;
+        request->send(200, "text/plain", String(progress));
+    }
+
+    if (final) {
+        if (!Update.end(true)) {
+            Serial.printf("Update.end failed: %s\n", Update.errorString());
+            request->send(500, "text/plain", "Update failed");
+            return;
+        }
+
+        // Try to restore configs
+        if (!SPIFFS.begin(true)) {
+            Serial.println("Failed to mount SPIFFS for restore");
+            request->send(200, "application/json", "{\"status\": \"success\", \"message\": \"Update successful but config restore failed. Device will restart...\", \"restart\": true}");
+            delay(2000);
+            ESP.restart();
+            return;
+        }
+
+        if (!restoreConfigs()) {
+            Serial.println("Failed to restore configs");
+        }
+
+        request->send(200, "application/json", "{\"status\": \"success\", \"message\": \"Update successful! Device will restart...\", \"restart\": true}");
+        delay(2000);
+        ESP.restart();
+    }
+}
+

src/ota.h

@@ -3,6 +3,6 @@
 
 #include <ESPAsyncWebServer.h>
 
-void setupOTA(AsyncWebServer &server);
+void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
 
 #endif

src/website.cpp

@@ -161,8 +161,6 @@ void setupWebserver(AsyncWebServer &server) {
     Serial.print("Geladene Spoolman-URL: ");
     Serial.println(spoolmanUrl);
 
-    setupOTA(server);
-
     // Route für about
     server.on("/about", HTTP_GET, [](AsyncWebServerRequest *request){
         Serial.println("Anfrage für /about erhalten");
@@ -340,6 +338,21 @@ void setupWebserver(AsyncWebServer &server) {
         Serial.println("RFID.js gesendet");
     });
 
+    // Route für Firmware Update
+    server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest *request) {
+        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/upgrade.html.gz", "text/html");
+        response->addHeader("Content-Encoding", "gzip");
+        response->addHeader("Cache-Control", CACHE_CONTROL);
+        request->send(response);
+    });
+
+    server.on("/update", HTTP_POST, 
+        [](AsyncWebServerRequest *request) {
+            // The response will be sent from handleOTAUpload when the upload is complete
+        },
+        handleOTAUpload
+    );
+
     // Fehlerbehandlung für nicht gefundene Seiten
     server.onNotFound([](AsyncWebServerRequest *request){
         Serial.print("404 - Nicht gefunden: ");