docs: update changelog for version 1.2.75

CHANGELOG.md

@@ -1,5 +1,85 @@
 # Changelog
 
+## [1.2.75] - 2025-02-20
+### Changed
+- update webpages for version v1.2.75
+- simplify OTA update handling by removing unnecessary variables and improving error reporting
+
+
+## [1.2.74] - 2025-02-20
+### Changed
+- update webpages for version v1.2.74
+- enhance OTA update process with improved handling of full image updates and SPIFFS data
+
+
+## [1.2.73] - 2025-02-20
+### Changed
+- update webpages for version v1.2.73
+- improve OTA update process with enhanced size checks and progress logging
+
+### Fixed
+- enhance OTA update process with improved size checks and debugging output
+
+
+## [1.2.72] - 2025-02-20
+### Changed
+- update webpages for version v1.2.72
+- simplify OTA update process by removing unnecessary buffer and adjusting offsets
+
+
+## [1.2.71] - 2025-02-20
+### Added
+- update version number to v1.2.65 in HTML files and platformio.ini; add script to create full binary
+
+### Changed
+- update webpages for version v1.2.71
+
+
+## [1.2.70] - 2025-02-20
+### Added
+- add logging to stopAllTasks for better debugging
+
+### Changed
+- update webpages for version v1.2.70
+
+
+## [1.2.69] - 2025-02-20
+### Changed
+- update webpages for version v1.2.69
+
+
+## [1.2.68] - 2025-02-20
+### Added
+- add task handles for BambuMqttTask and ScaleTask; rename stopTasks to stopAllTasks
+
+### Changed
+- update webpages for version v1.2.68
+
+### Fixed
+- update stopAllTasks to suspend RfidReaderTask instead of NfcTask
+
+
+## [1.2.67] - 2025-02-20
+### Added
+- improve OTA upload handling and add SPIFFS update support
+
+### Changed
+- update webpages for version v1.2.67
+
+
+## [1.2.66] - 2025-02-20
+### Added
+- enhance OTA upload to support SPIFFS updates
+
+### Changed
+- update webpages for version v1.2.66
+
+
+## [1.2.65] - 2025-02-20
+### Changed
+- update webpages for version v1.2.65
+
+
 ## [1.2.64] - 2025-02-20
 ### Changed
 - update webpages for version v1.2.64

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

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

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

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

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.2.64"
+version = "1.2.75"
 
 [env:esp32dev]
 platform = espressif32
@@ -59,6 +59,12 @@ build_flags =
     -DOTA_PARTITION_SUBTYPE=0x10
     -DPARTITION_TABLE_OFFSET=0x8000
     -DPARTITION_TABLE_SIZE=0x1000
+    -DCONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=1
+    -DCONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=1
+    -DCONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=1
+    -DCONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x1000
+    -DCONFIG_PARTITION_TABLE_OFFSET=0x8000
+    -DCONFIG_PARTITION_TABLE_MD5=y
     
 extra_scripts = 
     scripts/extra_script.py

src/bambu.h

@@ -36,4 +36,5 @@ void mqtt_loop(void * parameter);
 bool setBambuSpool(String payload);
 void bambu_restart();
 
+extern TaskHandle_t BambuMqttTask;
 #endif

src/ota.cpp

@@ -3,73 +3,59 @@
 #include <Update.h>
 #include <SPIFFS.h>
 #include "commonFS.h"
+#include "bambu.h"
+#include "scale.h"
+#include "nfc.h"
 
-// Magic byte patterns für verschiedene Image-Typen
-const uint8_t FIRMWARE_MAGIC = 0xE9;
 const uint8_t ESP_MAGIC = 0xE9;
+static bool tasksAreStopped = false;
+
+void stopAllTasks() {
+    Serial.println("Stopping RFID Reader");
+    if (RfidReaderTask) vTaskSuspend(RfidReaderTask);
+    Serial.println("Stopping Bambu");
+    if (BambuMqttTask) vTaskSuspend(BambuMqttTask);
+    Serial.println("Stopping Scale");
+    if (ScaleTask) vTaskSuspend(ScaleTask);
+    vTaskDelay(100 / portTICK_PERIOD_MS);
+    Serial.println("All tasks stopped");
+}
 
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
-    static size_t contentLength = 0;
-    static bool isFullImage = false;
-    static uint32_t currentOffset = 0;
-    
     if (!index) {
-        contentLength = request->contentLength();
+        Serial.printf("Update Start: %s\n", filename.c_str());
-        Serial.printf("Update size: %u bytes\n", contentLength);
+        if (request->contentLength() == 0) {
-        
-        if (contentLength == 0) {
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
             return;
         }
 
-        // Prüfe Magic Byte für Image-Typ
+        if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
-        if (data[0] == ESP_MAGIC) {
+            stopAllTasks();
-            // Normales Firmware Image oder full.bin
+            tasksAreStopped = true;
-            isFullImage = (contentLength > 0x3D0000);
-            
-            if (!Update.begin(contentLength)) {
-                Serial.printf("Not enough space: %u required\n", contentLength);
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
-                return;
-            }
-            
-            Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
-        } else {
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
-            return;
         }
-        currentOffset = 0;
+
-    }
+        if (!Update.begin(UPDATE_SIZE_UNKNOWN)) {
-    
-    // Schreibe Daten
-    if (Update.write(data, len) != len) {
-        String errorMsg = Update.errorString();
-        if (errorMsg != "No Error") {
             Update.printError(Serial);
-            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA could not begin\"}");
             return;
         }
     }
-    
+
-    currentOffset += len;
+    if (Update.write(data, len) != len) {
+        Update.printError(Serial);
+        request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA write failed\"}");
+        return;
+    }
 
     if (final) {
-        if (Update.end(true)) {
+        if (!Update.end(true)) {
-            Serial.println("Update complete");
+            Update.printError(Serial);
-            request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
+            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA end failed\"}");
-            delay(1000);
+            return;
-            ESP.restart();
-        } else {
-            String errorMsg = Update.errorString();
-            if (errorMsg != "No Error") {
-                Update.printError(Serial);
-                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
-            } else {
-                request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
-                delay(1000);
-                ESP.restart();
-            }
         }
+        request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
+        delay(500);
+        ESP.restart();
     }
 }
 

src/ota.h

@@ -3,6 +3,12 @@
 
 #include <ESPAsyncWebServer.h>
 
+// Update size unknown constant, falls nicht bereits definiert
+#ifndef UPDATE_SIZE_UNKNOWN
+#define UPDATE_SIZE_UNKNOWN 0xFFFFFFFF
+#endif
+
+void stopAllTasks();
 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
 
 #endif

src/scale.h

@@ -15,4 +15,6 @@ extern uint8_t weigthCouterToApi;
 extern uint8_t scale_tare_counter;
 extern uint8_t pauseMainTask;
 
+extern TaskHandle_t ScaleTask;
+
 #endif

src/wlan.cpp

@@ -12,7 +12,7 @@ bool wm_nonblocking = false;
 void initWiFi() {
     WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
   
-    esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm
+    //esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm
   
     if(wm_nonblocking) wm.setConfigPortalBlocking(false);
     wm.setConfigPortalTimeout(320); // Portal nach 5min schließen