CHANGELOG.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## [1.5.1] - 2025-03-30
-### Changed
-- update version to 1.5.1 and improve OTA update handling with task management
-
-
 ## [1.4.14] - 2025-03-30
 ### Added
 - add auto-tare functionality and update scale handling based on touch sensor connection

platformio.ini

@@ -9,8 +9,8 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.5.1"
+version = "1.4.14"
-to_old_version = "1.5.0"
+to_old_version = "1.4.0"
 
 ##
 [env:esp32dev]

src/main.cpp

@@ -190,7 +190,7 @@ void loop() {
     }
 
     // Prüfen ob das Gewicht gleich bleibt und dann senden
-    if (abs(weight - lastWeight) <= 2 && weight > 5)
+    if (weight == lastWeight && weight > 5)
     {
       weigthCouterToApi++;
     } 

src/ota.cpp

@@ -1,10 +1,6 @@
 #include <Arduino.h>
 #include <website.h>
 #include <commonFS.h>
-#include "scale.h"
-#include "bambu.h"
-#include "nfc.h"
-
 
 // Globale Variablen für Config Backups hinzufügen
 String bambuCredentialsBackup;
@@ -155,25 +151,6 @@ void handleUpdate(AsyncWebServer &server) {
 
     updateHandler->onUpload([](AsyncWebServerRequest *request, String filename,
                              size_t index, uint8_t *data, size_t len, bool final) {
-
-        // Disable all Tasks
-        if (BambuMqttTask != NULL) 
-        {
-            Serial.println("Delete BambuMqttTask");
-            vTaskDelete(BambuMqttTask);
-            BambuMqttTask = NULL;
-        }
-        if (ScaleTask) {
-            Serial.println("Delete ScaleTask");
-            vTaskDelete(ScaleTask);
-            ScaleTask = NULL;
-        }
-        if (RfidReaderTask) {
-            Serial.println("Delete RfidReaderTask");
-            vTaskDelete(RfidReaderTask);
-            RfidReaderTask = NULL;
-        }
-
         if (!index) {
             updateTotalSize = request->contentLength();
             updateWritten = 0;
@@ -182,9 +159,9 @@ void handleUpdate(AsyncWebServer &server) {
             if (isSpiffsUpdate) {
                 // Backup vor dem Update
                 sendUpdateProgress(0, "backup", "Backing up configurations...");
-                vTaskDelay(200 / portTICK_PERIOD_MS);
+                delay(200);
                 backupJsonConfigs();
-                vTaskDelay(200 / portTICK_PERIOD_MS);
+                delay(200);
                 
                 const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL);
                 if (!partition || !Update.begin(partition->size, U_SPIFFS)) {
@@ -192,14 +169,14 @@ void handleUpdate(AsyncWebServer &server) {
                     return;
                 }
                 sendUpdateProgress(5, "starting", "Starting SPIFFS update...");
-                vTaskDelay(200 / portTICK_PERIOD_MS);
+                delay(200);
             } else {
                 if (!Update.begin(updateTotalSize)) {
                     request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}");
                     return;
                 }
                 sendUpdateProgress(0, "starting", "Starting firmware update...");
-                vTaskDelay(200 / portTICK_PERIOD_MS);
+                delay(200);
             }
         }
 
@@ -225,7 +202,7 @@ void handleUpdate(AsyncWebServer &server) {
             if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) {
                 sendUpdateProgress(currentProgress, "uploading");
                 oledShowMessage("Update: " + String(currentProgress) + "%");
-                vTaskDelay(50 / portTICK_PERIOD_MS);
+                delay(50);
                 lastProgress = currentProgress;
             }
         }