.github/workflows/gitea-release.yml

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

CHANGELOG.md

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

html/upgrade.html

@@ -189,6 +189,13 @@
 
             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 {
@@ -196,27 +203,41 @@
                     try {
                         const jsonResponse = JSON.parse(response);
                         
-                        // Zeige finale Nachricht
+                        // Handle progress updates
-                        status.textContent = jsonResponse.message || "Update complete";
+                        if (jsonResponse.progress !== undefined) {
-                        status.classList.add(jsonResponse.success ? 'success' : 'error');
+                            const percent = jsonResponse.progress;
-                        status.style.display = 'block';
+                            progress.style.width = percent + '%';
+                            progress.textContent = Math.round(percent) + '%';
+                            return;
+                        }
                         
-                        if (jsonResponse.success) {
+                        // Handle success/error messages
-                            progress.style.width = '100%';
+                        response = jsonResponse.message;
-                            progress.textContent = '100%';
                         
-                            // Automatischer Neustart nach erfolgreicher Aktualisierung
+                        if (jsonResponse.restart) {
-                            status.textContent = "Update successful! Restarting device...";
+                            status.textContent = response + " Redirecting in 20 seconds...";
-                            setTimeout(() => {
+                            let countdown = 20;
-                                window.location.reload();
+                            const timer = setInterval(() => {
-                            }, 5000);
+                                countdown--;
-                        } else {
+                                if (countdown <= 0) {
-                            document.querySelectorAll('form input[type=submit]').forEach(btn => btn.disabled = false);
+                                    clearInterval(timer);
+                                    window.location.href = '/';
+                                } else {
+                                    status.textContent = response + ` Redirecting in ${countdown} seconds...`;
+                                }
+                            }, 1000);
                         }
                     } 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) {

platformio.ini

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

src/website.cpp

@@ -7,7 +7,6 @@
 #include "nfc.h"
 #include "scale.h"
 #include "esp_task_wdt.h"
-#include "esp_log.h"
 #include <Update.h>
 #include "display.h"
 
@@ -394,31 +393,28 @@ void setupWebserver(AsyncWebServer &server) {
             oledShowMessage("Upgrade please wait");
 
             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;
+                Serial.printf("Update Start: %s\nSize: %u\nCommand: %d\n", filename.c_str(), updateSize, command);
                 
                 if (command == U_SPIFFS) {
-                    oledShowMessage("SPIFFS Update...");
+                    Serial.println("Backup JSON configs...");
                     backupJsonConfigs();
                     
-                    if (!Update.begin(updateSize, command)) {
+                    // Deaktiviere alle Validierungen für SPIFFS-Updates
+                    if (!Update.begin(UPDATE_SIZE_UNKNOWN, command)) {
+                        Serial.printf("Update Begin Error: %s\n", Update.errorString());
                         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...");
+                    // Normale Validierung für Firmware-Updates
                     if (!Update.begin(updateSize, command)) {
+                        Serial.printf("Update Begin Error: %s\n", Update.errorString());
                         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;
                     }
                 }
@@ -426,6 +422,7 @@ void setupWebserver(AsyncWebServer &server) {
 
             if (len) {
                 if (Update.write(data, len) != len) {
+                    Serial.printf("Update Write Error: %s\n", Update.errorString());
                     if (command == U_SPIFFS) {
                         restoreJsonConfigs();
                     }
@@ -434,28 +431,23 @@ void setupWebserver(AsyncWebServer &server) {
                     return;
                 }
                 
-                // Update OLED Display alle 25%
+                // Sende den Fortschritt als JSON
-                static int lastProgress = -1;
+                String progress = "{\"progress\":" + String((index + len) * 100 / updateSize) + "}";
-                int currentProgress = (index + len) * 100 / updateSize;
+                request->send(200, "application/json", progress);
-                if (currentProgress % 25 == 0 && currentProgress != lastProgress) {
-                    lastProgress = currentProgress;
-                    oledShowMessage(String(currentProgress) + "% complete");
-                }
             }
 
             if (final) {
                 if (!Update.end(true)) {
+                    Serial.printf("Update End Error: %s\n", Update.errorString());
                     if (command == U_SPIFFS) {
+                        Serial.println("Restoring JSON configs...");
                         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
+                Serial.println("Update Success!");
-                esp_log_level_set("*", ESP_LOG_INFO);
             }
         }
     );