docs: update changelog for version 1.3.58

.github/workflows/gitea-release.yml

@@ -40,11 +40,8 @@ jobs:
         # Copy firmware binary
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
         
-        # Create SPIFFS binary with ESP32 image header
-        # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz, chip revision v3.1)
-        echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x30\x00\x00\x03\x01\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
-        # Append the actual SPIFFS data
-        cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
+        # Create SPIFFS binary - direct copy without header
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
         
         # Create full binary
         (cd .pio/build/esp32dev && 

.github/workflows/github-release.yml

@@ -47,11 +47,8 @@ jobs:
         # Copy firmware binary
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
         
-        # Create SPIFFS binary with ESP32 image header
-        # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz, chip revision v3.1)
-        echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x30\x00\x00\x03\x01\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
-        # Append the actual SPIFFS data
-        cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
+        # Create SPIFFS binary - direct copy without header
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
         
         # Create full binary (always)
         (cd .pio/build/esp32dev && 

CHANGELOG.md

@@ -1,5 +1,148 @@
 # Changelog
 
+## [1.3.58] - 2025-02-22
+### Added
+- implement backup and restore functionality for Bambu credentials and Spoolman URL
+
+### Changed
+- update webpages for version v1.3.58
+- update upgrade page message and improve progress display logic
+
+
+## [1.3.57] - 2025-02-22
+### Changed
+- update webpages for version v1.3.57
+- update header title to 'Filament Management Tool' in multiple HTML files
+
+
+## [1.3.56] - 2025-02-22
+### Changed
+- update webpages for version v1.3.56
+- update header title and improve SPIFFS update error handling
+- clarify comments in Gitea and GitHub release workflows
+
+
+## [1.3.55] - 2025-02-22
+### Changed
+- update webpages for version v1.3.55
+- update component descriptions in README files
+
+
+## [1.3.54] - 2025-02-22
+### Changed
+- update webpages for version v1.3.54
+- workflow: update SPIFFS binary creation to exclude header
+
+
+## [1.3.53] - 2025-02-22
+### Changed
+- version: update to version 1.3.53
+- update changelog for version 1.3.51
+- update changelog for version 1.3.51
+- workflow: update SPIFFS binary magic byte and revert version to 1.3.51
+
+
+## [1.3.52] - 2025-02-22
+### Changed
+- update webpages for version v1.3.52
+- workflow: update SPIFFS binary creation to use correct chip revision (0xEB for Rev 3)
+
+
+## [1.3.51] - 2025-02-22
+### Changed
+- update changelog for version 1.3.51
+- workflow: update SPIFFS binary magic byte and revert version to 1.3.51
+
+## [1.3.50] - 2025-02-22
+### Changed
+- update webpages for version v1.3.50
+
+
+## [1.3.49] - 2025-02-22
+### Changed
+- update webpages for version v1.3.49
+- workflow: update SPIFFS binary header to use correct chip revision
+
+
+## [1.3.48] - 2025-02-22
+### Changed
+- update webpages for version v1.3.48
+- workflow: update SPIFFS binary header for firmware release
+
+
+## [1.3.47] - 2025-02-22
+### Changed
+- update webpages for version v1.3.47
+- workflow: optimize firmware and SPIFFS update process, improve progress handling and logging
+
+
+## [1.3.46] - 2025-02-22
+### Changed
+- update webpages for version v1.3.46
+
+
+## [1.3.45] - 2025-02-22
+### Changed
+- update webpages for version v1.3.45
+- workflow: update SPIFFS binary creation to include minimal header and adjust update validation logic
+
+
+## [1.3.44] - 2025-02-22
+### Changed
+- update webpages for version v1.3.44
+- update header title to 'Hollo Lollo Trollo'
+- update header title to 'Filament Management Tool' and improve update response messages
+
+
+## [1.3.43] - 2025-02-22
+### Changed
+- update webpages for version v1.3.43
+- update header title to 'Hollo Lollo Trollo'
+
+
+## [1.3.42] - 2025-02-22
+### Changed
+- update webpages for version v1.3.42
+
+### Fixed
+- correct path for SPIFFS binary creation in Gitea release workflow
+
+
+## [1.3.41] - 2025-02-22
+### Changed
+- update webpages for version v1.3.41
+
+### Fixed
+- remove redundant buffer size setting in NFC initialization
+- update SPIFFS binary creation and enhance NFC buffer size
+
+
+## [1.3.40] - 2025-02-22
+### Changed
+- update webpages for version v1.3.40
+
+### Fixed
+- update SPIFFS binary header and enhance WebSocket error handling
+
+
+## [1.3.39] - 2025-02-22
+### Changed
+- update webpages for version v1.3.39
+- workflow: update SPIFFS binary creation to set chip version to max supported
+
+
+## [1.3.38] - 2025-02-22
+### Changed
+- update webpages for version v1.3.38
+- workflow: update SPIFFS binary creation with minimal ESP32 image header
+
+
+## [1.3.37] - 2025-02-22
+### Changed
+- update webpages for version v1.3.37
+- workflow: update ESP32-WROOM image header for SPIFFS binary creation
+
+
 ## [1.3.36] - 2025-02-22
 ### Changed
 - update webpages for version v1.3.36

README.de.md

@@ -53,14 +53,14 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO
 ### Komponenten
 - **ESP32 Entwicklungsboard:** Jede ESP32-Variante.
 [Amazon Link](https://amzn.eu/d/aXThslf)
-- **HX711 Wägezellen-Verstärker:** Für Gewichtsmessung.
-[Amazon Link](https://amzn.eu/d/1wZ4v0x)
-- **OLED Display:** 128x64 SSD1306.
-[Amazon Link](https://amzn.eu/d/dozAYDU)
-- **PN532 NFC Modul:** Für NFC-Tag-Operationen.
-[Amazon Link](https://amzn.eu/d/8205DDh)
-- **NFC-Tag:** NTAG215
-[Amazon Link](https://amzn.eu/d/fywy4c4)
+- **HX711 5kg Wägezellen-Verstärker:** Für Gewichtsmessung.
+[Amazon Link](https://amzn.eu/d/06A0DLb)
+- **OLED 0.96 Zoll I2C weiß/gelb Display:** 128x64 SSD1306.
+[Amazon Link](https://amzn.eu/d/0AuBp2c)
+- **PN532 NFC NXP RFID-Modul V3:** Für NFC-Tag-Operationen.
+[Amazon Link](https://amzn.eu/d/jfIuQXb)
+- **NFC Tags Ntag215:** RFID Tag
+[Amazon Link](https://amzn.eu/d/9Z6mXc1)
 
 ### Pin-Konfiguration
 | Komponente        | ESP32 Pin |

README.md

@@ -56,14 +56,14 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
 ### Components
 - **ESP32 Development Board:** Any ESP32 variant.
 [Amazon Link](https://amzn.eu/d/aXThslf)
-- **HX711 Load Cell Amplifier:** For weight measurement.
-[Amazon Link](https://amzn.eu/d/1wZ4v0x)
-- **OLED Display:** 128x64 SSD1306.
-[Amazon Link](https://amzn.eu/d/dozAYDU)
-- **PN532 NFC Module:** For NFC tag operations.
-[Amazon Link](https://amzn.eu/d/8205DDh)
-- **NFC-Tag:** NTAG215
-[Amazon Link](https://amzn.eu/d/fywy4c4)
+- **HX711 5kg Load Cell Amplifier:** For weight measurement.
+[Amazon Link](https://amzn.eu/d/06A0DLb)
+- **OLED 0.96 Zoll I2C white/yellow Display:** 128x64 SSD1306.
+[Amazon Link](https://amzn.eu/d/0AuBp2c)
+- **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
+[Amazon Link](https://amzn.eu/d/jfIuQXb)
+- **NFC Tags Ntag215:** RFID Tag
+[Amazon Link](https://amzn.eu/d/9Z6mXc1)
 
 
 ### Pin Configuration

html/upgrade.html

@@ -189,48 +189,34 @@
 
             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 {
                         const jsonResponse = JSON.parse(response);
-                        response = jsonResponse.message;
                         
-                        if (jsonResponse.restart) {
-                            status.textContent = response + " Redirecting in 20 seconds...";
-                            let countdown = 20;
-                            const timer = setInterval(() => {
-                                countdown--;
-                                if (countdown <= 0) {
-                                    clearInterval(timer);
-                                    window.location.href = '/';
-                                } else {
-                                    status.textContent = response + ` Redirecting in ${countdown} seconds...`;
-                                }
-                            }, 1000);
+                        // Zeige finale Nachricht
+                        status.textContent = jsonResponse.message || "Update complete";
+                        status.classList.add(jsonResponse.success ? 'success' : 'error');
+                        status.style.display = 'block';
+                        
+                        if (jsonResponse.success) {
+                            progress.style.width = '100%';
+                            progress.textContent = '100%';
+                            
+                            // Automatischer Neustart nach erfolgreicher Aktualisierung
+                            status.textContent = "Update successful! Restarting device... The page will reload in 30 seconds.";
+                            setTimeout(() => {
+                                window.location.href = '/';
+                            }, 30000);
+                        } else {
+                            document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
                         }
                     } catch (e) {
-                        if (!isNaN(response)) {
-                            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) {
+                        console.error('JSON parse error:', e);
+                        status.textContent = 'Update failed: Invalid response from server';
+                        status.classList.add('error');
                         document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
                     }
                 } catch (error) {

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.3.36"
+version = "1.3.58"
 
 #test
 
@@ -54,12 +54,8 @@ build_flags =
     -DCONFIG_ARDUHAL_LOG_COLORS=1
     -DOTA_DEBUG=1
     -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
-    -DCONFIG_ESP32_PANIC_PRINT_REBOOT
     -DBOOT_APP_PARTITION_OTA_0=1
-    -DCONFIG_LOG_DEFAULT_LEVEL=3
     -DCONFIG_LWIP_TCP_MSL=60000
-    -DCONFIG_LWIP_TCP_WND_DEFAULT=8192
-    -DCONFIG_LWIP_TCP_SND_BUF_DEFAULT=4096
     -DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=4096
     -DCONFIG_LWIP_MAX_ACTIVE_TCP=16
     

src/main.cpp

@@ -19,6 +19,12 @@
 void setup() {
   Serial.begin(115200);
 
+  uint64_t chipid;
+
+  chipid = ESP.getEfuseMac(); //The chip ID is essentially its MAC address(length: 6 bytes).
+  Serial.printf("ESP32 Chip ID = %04X", (uint16_t)(chipid >> 32)); //print High 2 bytes
+  Serial.printf("%08X\n", (uint32_t)chipid); //print Low 4bytes.
+
   // Initialize SPIFFS
   initializeSPIFFS();
 

src/website.cpp

@@ -8,6 +8,7 @@
 #include "scale.h"
 #include "esp_task_wdt.h"
 #include <Update.h>
+#include "display.h"
 
 #ifndef VERSION
   #define VERSION "1.1.0"
@@ -22,6 +23,10 @@ AsyncWebSocket ws("/ws");
 uint8_t lastSuccess = 0;
 uint8_t lastHasReadRfidTag = 0;
 
+// Globale Variablen für Config Backups hinzufügen
+String bambuCredentialsBackup;
+String spoolmanUrlBackup;
+
 void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
     if (type == WS_EVT_CONNECT) {
         Serial.println("Neuer Client verbunden!");
@@ -32,6 +37,10 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
         sendWriteResult(client, 3);
     } else if (type == WS_EVT_DISCONNECT) {
         Serial.println("Client getrennt.");
+    } else if (type == WS_EVT_ERROR) {
+        Serial.printf("WebSocket Client #%u error(%u): %s\n", client->id(), *((uint16_t*)arg), (char*)data);
+    } else if (type == WS_EVT_PONG) {
+        Serial.printf("WebSocket Client #%u pong\n", client->id());
     } else if (type == WS_EVT_DATA) {
         String message = String((char*)data);
         JsonDocument doc;
@@ -160,6 +169,9 @@ void sendAmsData(AsyncWebSocketClient *client) {
 }
 
 void setupWebserver(AsyncWebServer &server) {
+    // Deaktiviere alle Debug-Ausgaben
+    Serial.setDebugOutput(false);
+    
     // WebSocket-Optimierungen
     ws.onEvent(onWsEvent);
     ws.enable(true);
@@ -363,58 +375,96 @@ void setupWebserver(AsyncWebServer &server) {
         [](AsyncWebServerRequest *request) {
             // Nach Update-Abschluss
             bool success = !Update.hasError();
+            String message = success ? "Update successful" : String("Update failed: ") + Update.errorString();
             AsyncWebServerResponse *response = request->beginResponse(
                 success ? 200 : 400,
                 "application/json",
-                success ? "{\"success\":true,\"message\":\"Update successful\"}" 
-                       : "{\"success\":false,\"message\":\"Update failed\"}"
+                "{\"success\":" + String(success ? "true" : "false") + ",\"message\":\"" + message + "\"}"
             );
             response->addHeader("Connection", "close");
             request->send(response);
             
             if (success) {
+                oledShowMessage("Upgrade successful Rebooting");
                 delay(500);
                 ESP.restart();
             }
+            else {
+                oledShowMessage("Upgrade failed");
+            }
         },
         [](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) {
             static size_t updateSize = 0;
             static int command = 0;
 
+            //oledShowMessage("Upgrade please wait");
+
             if (!index) {
                 updateSize = request->contentLength();
-                command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH;
-                Serial.printf("Update Start: %s\nSize: %u\nCommand: %d\n", filename.c_str(), updateSize, command);
-
-                if (!Update.begin(updateSize, command)) {
-                    Serial.printf("Update Begin Error: ");
-                    Update.printError(Serial);
-                    String errorMsg = String("Update begin failed: ") + Update.errorString();
-                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
-                    return;
+                command = (filename.indexOf("website") > -1) ? U_SPIFFS : U_FLASH;
+                
+                if (command == U_SPIFFS) {
+                    oledShowMessage("SPIFFS Update...");
+                    backupJsonConfigs();
+                    
+                    // Get the actual SPIFFS partition size from ESP32
+                    const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL);
+                    if (!partition) {
+                        restoreJsonConfigs();
+                        String errorMsg = "SPIFFS partition not found";
+                        request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
+                        return;
+                    }
+                    
+                    if (!Update.begin(partition->size, command)) {
+                        restoreJsonConfigs();
+                        String errorMsg = String("Update begin failed: ") + Update.errorString();
+                        request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
+                        return;
+                    }
+                } else {
+                    oledShowMessage("Firmware Update...");
+                    if (!Update.begin(updateSize, command)) {
+                        String errorMsg = String("Update begin failed: ") + Update.errorString();
+                        request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
+                        return;
+                    }
                 }
             }
 
             if (len) {
                 if (Update.write(data, len) != len) {
-                    Serial.printf("Update Write Error: ");
-                    Update.printError(Serial);
+                    if (command == U_SPIFFS) {
+                        restoreJsonConfigs();
+                    }
                     String errorMsg = String("Write failed: ") + Update.errorString();
                     request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
                     return;
                 }
-                Serial.printf("Progress: %u/%u\r", index + len, updateSize);
+                
+                // Update OLED Display alle 5% und Webseite bei jeder Änderung
+                static int lastProgress = -1;
+                int currentProgress = (index + len) * 100 / updateSize;
+                if (currentProgress != lastProgress) {
+                    // OLED nur alle 5% aktualisieren
+                    if (currentProgress % 5 == 0) {
+                        oledShowMessage(String(currentProgress) + "% complete");
+                    }
+                    // Webseite bei jeder Änderung aktualisieren
+                    lastProgress = currentProgress;
+                    ws.textAll("{\"type\":\"updateProgress\",\"progress\":" + String(currentProgress) + "}");
+                }
             }
 
             if (final) {
                 if (!Update.end(true)) {
-                    Serial.printf("Update End Error: ");
-                    Update.printError(Serial);
+                    if (command == U_SPIFFS) {
+                        restoreJsonConfigs();
+                    }
                     String errorMsg = String("Update end failed: ") + Update.errorString();
                     request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
                     return;
                 }
-                Serial.printf("\nUpdate Success: %uB\n", index+len);
             }
         }
     );
@@ -442,79 +492,49 @@ void setupWebserver(AsyncWebServer &server) {
     Serial.println("Webserver gestartet");
 }
 
-void handleOTAUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) {
-    static bool isSpiffsUpdate = false;
-    if (!index) {
-        // Start eines neuen Uploads
-        Serial.println("Update Start: " + filename);
-        
-        // Überprüfe den Dateityp basierend auf dem Dateinamen
-        bool isFirmware = filename.startsWith("filaman_");
-        isSpiffsUpdate = filename.startsWith("webpage_");
-        
-        if (!isFirmware && !isSpiffsUpdate) {
-            request->send(400, "application/json", "{\"message\":\"Invalid file type. File must start with 'filaman_' or 'webpage_'\"}");
-            return;
-        }
-
-        // Wähle den Update-Typ basierend auf dem Dateinamen
-        if (isSpiffsUpdate) {
-            if (!Update.begin(SPIFFS.totalBytes(), U_SPIFFS)) {
-                Update.printError(Serial);
-                request->send(400, "application/json", "{\"message\":\"SPIFFS Update failed: " + String(Update.errorString()) + "\"}");
-                return;
-            }
-            // Backup JSON configs before SPIFFS update
-            backupJsonConfigs();
-        } else {
-            if (!Update.begin(UPDATE_SIZE_UNKNOWN, U_FLASH)) {
-                Update.printError(Serial);
-                request->send(400, "application/json", "{\"message\":\"Firmware Update failed: " + String(Update.errorString()) + "\"}");
-                return;
-            }
-        }
-    }
-
-    if (Update.write(data, len) != len) {
-        Update.printError(Serial);
-        request->send(400, "application/json", "{\"message\":\"Write failed: " + String(Update.errorString()) + "\"}");
-        return;
-    }
-
-    if (final) {
-        if (!Update.end(true)) {
-            Update.printError(Serial);
-            request->send(400, "application/json", "{\"message\":\"Update failed: " + String(Update.errorString()) + "\"}");
-            return;
-        }
-        if (isSpiffsUpdate) {
-            // Restore JSON configs after SPIFFS update
-            restoreJsonConfigs();
-        }
-        request->send(200, "application/json", "{\"message\":\"Update successful!\", \"restart\": true}");
-        delay(500);
-        ESP.restart();
-    }
-}
 
 void backupJsonConfigs() {
-    const char* configs[] = {"/bambu_credentials.json", "/spoolman_url.json"};
-    for (const char* config : configs) {
-        if (SPIFFS.exists(config)) {
-            String backupPath = String(config) + ".bak";
-            SPIFFS.remove(backupPath);
-            SPIFFS.rename(config, backupPath);
+    // Bambu Credentials backup
+    if (SPIFFS.exists("/bambu_credentials.json")) {
+        File file = SPIFFS.open("/bambu_credentials.json", "r");
+        if (file) {
+            bambuCredentialsBackup = file.readString();
+            file.close();
+            Serial.println("Bambu credentials backed up");
+        }
+    }
+
+    // Spoolman URL backup
+    if (SPIFFS.exists("/spoolman_url.json")) {
+        File file = SPIFFS.open("/spoolman_url.json", "r");
+        if (file) {
+            spoolmanUrlBackup = file.readString();
+            file.close();
+            Serial.println("Spoolman URL backed up");
         }
     }
 }
 
 void restoreJsonConfigs() {
-    const char* configs[] = {"/bambu_credentials.json", "/spoolman_url.json"};
-    for (const char* config : configs) {
-        String backupPath = String(config) + ".bak";
-        if (SPIFFS.exists(backupPath)) {
-            SPIFFS.remove(config);
-            SPIFFS.rename(backupPath, config);
+    // Restore Bambu credentials
+    if (bambuCredentialsBackup.length() > 0) {
+        File file = SPIFFS.open("/bambu_credentials.json", "w");
+        if (file) {
+            file.print(bambuCredentialsBackup);
+            file.close();
+            Serial.println("Bambu credentials restored");
         }
+        bambuCredentialsBackup = ""; // Clear backup
+    }
+
+    // Restore Spoolman URL
+    if (spoolmanUrlBackup.length() > 0) {
+        File file = SPIFFS.open("/spoolman_url.json", "w");
+        if (file) {
+            file.print(spoolmanUrlBackup);
+            file.close();
+            Serial.println("Spoolman URL restored");
+        }
+        spoolmanUrlBackup = ""; // Clear backup
     }
 }