docs: update changelog for version 1.3.48

.github/workflows/gitea-release.yml

@@ -40,8 +40,8 @@ jobs:
         # Copy firmware binary
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
         
-        # Create SPIFFS binary (without header)
-        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
+        # Create SPIFFS binary with minimal header
+        ( printf '\xe9\x01\x00\x00' && cat .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,8 +47,8 @@ jobs:
         # Copy firmware binary
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
         
-        # Create SPIFFS binary (without header)
-        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
+        # Create SPIFFS binary with minimal header
+        ( printf '\xe9\x01\x00\x00' && cat .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,41 @@
 # Changelog
 
+## [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

html/header.html

@@ -24,7 +24,7 @@
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
                 <h1>FilaMan<span class="version"></span></h1>
-                <h4>Filament Management Tool</h4>
+                <h4>Hollo Lollo Trollo</h4>
             </div>
         </div>
         <nav style="display: flex; gap: 1rem;">

html/index.html

@@ -24,7 +24,7 @@
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
                 <h1>FilaMan<span class="version"></span></h1>
-                <h4>Filament Management Tool</h4>
+                <h4>Hollo Lollo Trollo</h4>
             </div>
         </div>
         <nav style="display: flex; gap: 1rem;">

html/rfid.html

@@ -24,7 +24,7 @@
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
                 <h1>FilaMan<span class="version"></span></h1>
-                <h4>Filament Management Tool</h4>
+                <h4>Hollo Lollo Trollo</h4>
             </div>
         </div>
         <nav style="display: flex; gap: 1rem;">

html/spoolman.html

@@ -24,7 +24,7 @@
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
                 <h1>FilaMan<span class="version"></span></h1>
-                <h4>Filament Management Tool</h4>
+                <h4>Hollo Lollo Trollo</h4>
             </div>
         </div>
         <nav style="display: flex; gap: 1rem;">

html/upgrade.html

@@ -24,7 +24,7 @@
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
                 <h1>FilaMan<span class="version"></span></h1>
-                <h4>Filament Management Tool</h4>
+                <h4>Hollo Lollo Trollo</h4>
             </div>
         </div>
         <nav style="display: flex; gap: 1rem;">
@@ -189,13 +189,6 @@
 
             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 {
@@ -203,41 +196,27 @@
                     try {
                         const jsonResponse = JSON.parse(response);
                         
-                        // Handle progress updates
-                        if (jsonResponse.progress !== undefined) {
-                            const percent = jsonResponse.progress;
-                            progress.style.width = percent + '%';
-                            progress.textContent = Math.round(percent) + '%';
-                            return;
-                        }
+                        // Zeige finale Nachricht
+                        status.textContent = jsonResponse.message || "Update complete";
+                        status.classList.add(jsonResponse.success ? 'success' : 'error');
+                        status.style.display = 'block';
                         
-                        // Handle success/error messages
-                        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);
+                        if (jsonResponse.success) {
+                            progress.style.width = '100%';
+                            progress.textContent = '100%';
+                            
+                            // Automatischer Neustart nach erfolgreicher Aktualisierung
+                            status.textContent = "Update successful! Restarting device...";
+                            setTimeout(() => {
+                                window.location.reload();
+                            }, 5000);
+                        } else {
+                            document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
                         }
                     } catch (e) {
                         console.error('JSON parse error:', e);
                         status.textContent = 'Update failed: Invalid response from server';
                         status.classList.add('error');
-                    }
-                    
-                    status.textContent = response;
-                    status.classList.add(xhr.status === 200 ? 'success' : 'error');
-                    status.style.display = 'block';
-                    
-                    if (xhr.status !== 200) {
                         document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
                     }
                 } catch (error) {

html/waage.html

@@ -24,7 +24,7 @@
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
                 <h1>FilaMan<span class="version"></span></h1>
-                <h4>Filament Management Tool</h4>
+                <h4>Hollo Lollo Trollo</h4>
             </div>
         </div>
         <nav style="display: flex; gap: 1rem;">

html/wifi.html

@@ -24,7 +24,7 @@
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
                 <h1>FilaMan<span class="version"></span></h1>
-                <h4>Filament Management Tool</h4>
+                <h4>Hollo Lollo Trollo</h4>
             </div>
         </div>
         <nav style="display: flex; gap: 1rem;">

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.3.42"
+version = "1.3.48"
 
 #test
 

src/website.cpp

@@ -7,6 +7,7 @@
 #include "nfc.h"
 #include "scale.h"
 #include "esp_task_wdt.h"
+#include "esp_log.h"
 #include <Update.h>
 #include "display.h"
 
@@ -368,11 +369,11 @@ 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);
@@ -392,33 +393,40 @@ void setupWebserver(AsyncWebServer &server) {
 
             oledShowMessage("Upgrade please wait");
 
-            // TODO: Backup
-
             if (!index) {
+                // Reduziere Debug-Level während des Updates
+                esp_log_level_set("*", ESP_LOG_ERROR);
+                
                 updateSize = request->contentLength();
                 command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH;
                 
                 if (command == U_SPIFFS) {
-                    // Backup JSON config files before SPIFFS update
+                    oledShowMessage("SPIFFS Update...");
                     backupJsonConfigs();
-                }
-                
-                // Setze spezifische Update-Flags für SPIFFS-Updates
-                if (!Update.begin(updateSize, command, command == U_SPIFFS ? true : false, command == U_SPIFFS ? 0 : -1)) {
-                    if (command == U_SPIFFS) {
-                        // Restore JSON config files if update fails at start
+                    
+                    if (!Update.begin(updateSize, command)) {
                         restoreJsonConfigs();
+                        String errorMsg = String("Update begin failed: ") + Update.errorString();
+                        request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
+                        // Stelle Debug-Level wieder her
+                        esp_log_level_set("*", ESP_LOG_INFO);
+                        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 + "\"}");
+                        // Stelle Debug-Level wieder her
+                        esp_log_level_set("*", ESP_LOG_INFO);
+                        return;
                     }
-                    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) {
                     if (command == U_SPIFFS) {
-                        // Restore JSON config files if update fails during write
                         restoreJsonConfigs();
                     }
                     String errorMsg = String("Write failed: ") + Update.errorString();
@@ -426,21 +434,28 @@ void setupWebserver(AsyncWebServer &server) {
                     return;
                 }
                 
-                // Sende den Fortschritt als JSON, um unerwünschte Zeilenumbrüche zu vermeiden
-                String progress = "{\"progress\":" + String((index + len) * 100 / updateSize) + "}";
-                request->send(200, "application/json", progress);
+                // Update OLED Display alle 25%
+                static int lastProgress = -1;
+                int currentProgress = (index + len) * 100 / updateSize;
+                if (currentProgress % 25 == 0 && currentProgress != lastProgress) {
+                    lastProgress = currentProgress;
+                    oledShowMessage(String(currentProgress) + "% complete");
+                }
             }
 
             if (final) {
                 if (!Update.end(true)) {
                     if (command == U_SPIFFS) {
-                        // Restore JSON config files if update fails at end
                         restoreJsonConfigs();
                     }
                     String errorMsg = String("Update end failed: ") + Update.errorString();
                     request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
+                    // Stelle Debug-Level wieder her
+                    esp_log_level_set("*", ESP_LOG_INFO);
                     return;
                 }
+                // Stelle Debug-Level wieder her
+                esp_log_level_set("*", ESP_LOG_INFO);
             }
         }
     );