docs: update changelog for version 1.3.46

.github/workflows/gitea-release.yml

@@ -40,9 +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 magic byte
+        # Create SPIFFS binary with minimal header
-        echo -ne '\xEA' > .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
-        cat .pio.build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
         
         # Create full binary
         (cd .pio/build/esp32dev && 
@@ -55,7 +54,7 @@ jobs:
           0x1000 bootloader.bin \
           0x8000 partitions.bin \
           0x10000 firmware.bin \
-          0x390000 spiffs.bin)
+          0x3D0000 spiffs.bin)
         
         # Verify file sizes
         echo "File sizes:"

.github/workflows/github-release.yml

@@ -35,28 +35,6 @@ jobs:
         sudo apt-get update
         sudo apt-get install xxd
     
-    - name: Check for Data changes
-      id: check_data
-      run: |
-        git fetch --unshallow || true
-        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
-        if echo "$CHANGED_FILES" | grep -q "^data/"; then
-          echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT
-        else
-          echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT
-        fi
-
-    - name: Check for SPIFFS changes
-      id: check_spiffs
-      run: |
-        git fetch --unshallow || true
-        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
-        if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then
-          echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT
-        else
-          echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT
-        fi
-    
     - name: Build Firmware
       run: |
         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
@@ -69,9 +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 magic byte
+        # Create SPIFFS binary with minimal header
-        echo -ne '\xEA' > .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
-        cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
         
         # Create full binary (always)
         (cd .pio/build/esp32dev && 
@@ -84,7 +61,7 @@ jobs:
           0x1000 bootloader.bin \
           0x8000 partitions.bin \
           0x10000 firmware.bin \
-          0x390000 spiffs.bin)
+          0x3D0000 spiffs.bin)
         
         # Verify file sizes
         echo "File sizes:"

CHANGELOG.md

@@ -1,5 +1,110 @@
 # Changelog
 
+## [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
+- partition: update SPIFFS binary header and offsets in workflow files
+
+
+## [1.3.35] - 2025-02-22
+### Changed
+- update webpages for version v1.3.35
+- partition: update SPIFFS binary header and offsets in workflow files
+
+
+## [1.3.34] - 2025-02-22
+### Changed
+- update webpages for version v1.3.34
+- partition: update SPIFFS binary creation and offsets in workflow files
+
+
+## [1.3.33] - 2025-02-22
+### Changed
+- update webpages for version v1.3.33
+- partition: update spiffs offset and app sizes in partition files
+- partition: update spiffs offset in partition files
+- partition: update app sizes and offsets in partitions.csv
+
+
+## [1.3.32] - 2025-02-22
+### Changed
+- update webpages for version v1.3.32
+- workflow: update magic byte for SPIFFS binary creation
+
+
+## [1.3.31] - 2025-02-22
+### Changed
+- update webpages for version v1.3.31
+- workflow: remove unnecessary data and SPIFFS change checks from release workflows
+
+
 ## [1.3.30] - 2025-02-22
 ### Changed
 - update webpages for version v1.3.30

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/upgrade.html

@@ -202,6 +202,16 @@
                     let response = this.responseText;
                     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;
+                        }
+                        
+                        // Handle success/error messages
                         response = jsonResponse.message;
                         
                         if (jsonResponse.restart) {
@@ -218,12 +228,9 @@
                             }, 1000);
                         }
                     } catch (e) {
-                        if (!isNaN(response)) {
+                        console.error('JSON parse error:', e);
-                            const percent = parseInt(response);
+                        status.textContent = 'Update failed: Invalid response from server';
-                            progress.style.width = percent + '%';
+                        status.classList.add('error');
-                            progress.textContent = percent + '%';
-                            return;
-                        }
                     }
                     
                     status.textContent = response;

partitions.csv

@@ -1,6 +1,6 @@
 # Name,   Type, SubType,    Offset,   Size,     Flags
 nvs,      data, nvs,       0x9000,   0x5000,
 otadata,  data, ota,       0xe000,   0x2000,
-app0,     app,  ota_0,     0x10000,  0x180000,
+app0,     app,  ota_0,     0x10000,  0x1E0000,
-app1,     app,  ota_1,     0x190000, 0x180000,
+app1,     app,  ota_1,     0x1F0000, 0x1E0000,
-spiffs,   data, spiffs,    0x310000, 0xE0000,
+spiffs,   data, spiffs,    0x3D0000, 0x30000,

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.3.30"
+version = "1.3.46"
 
 #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"
@@ -32,6 +33,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;
@@ -363,58 +368,86 @@ 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\":" + String(success ? "true" : "false") + ",\"message\":\"" + message + "\"}"
-                       : "{\"success\":false,\"message\":\"Update failed\"}"
             );
             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)) {
+                if (command == U_SPIFFS) {
-                    Serial.printf("Update Begin Error: ");
+                    Serial.println("Backup JSON configs...");
-                    Update.printError(Serial);
+                    backupJsonConfigs();
-                    String errorMsg = String("Update begin failed: ") + Update.errorString();
+                    
-                    request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
+                    // Deaktiviere alle Validierungen für SPIFFS-Updates
-                    return;
+                    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 + "\"}");
+                        return;
+                    }
+                } else {
+                    // 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 + "\"}");
+                        return;
+                    }
                 }
             }
 
             if (len) {
                 if (Update.write(data, len) != len) {
-                    Serial.printf("Update Write Error: ");
+                    Serial.printf("Update Write Error: %s\n", Update.errorString());
-                    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);
+                
+                // Sende den Fortschritt als JSON
+                String progress = "{\"progress\":" + String((index + len) * 100 / updateSize) + "}";
+                request->send(200, "application/json", progress);
             }
 
             if (final) {
                 if (!Update.end(true)) {
-                    Serial.printf("Update End Error: ");
+                    Serial.printf("Update End Error: %s\n", Update.errorString());
-                    Update.printError(Serial);
+                    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 + "\"}");
                     return;
                 }
-                Serial.printf("\nUpdate Success: %uB\n", index+len);
+                Serial.println("Update Success!");
             }
         }
     );
@@ -442,60 +475,6 @@ 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"};