docs: update changelog for version 1.2.68

docs: update webpages for version v1.2.68
fix: update stopAllTasks to suspend RfidReaderTask instead of NfcTask
2025-02-20 11:53:15 +01:00 · 2025-02-20 11:53:15 +01:00 · 2025-02-20 11:53:04 +01:00 · 2025-02-20 11:52:36 +01:00
12 changed files with 31 additions and 12 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,16 @@
 # Changelog

+## [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
--- a/html/header.html
+++ b/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.67</span></h1>
+                <h1>FilaMan<span class="version">v1.2.68</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/index.html
+++ b/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.67</span></h1>
+                <h1>FilaMan<span class="version">v1.2.68</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/rfid.html
+++ b/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.67</span></h1>
+                <h1>FilaMan<span class="version">v1.2.68</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/spoolman.html
+++ b/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.67</span></h1>
+                <h1>FilaMan<span class="version">v1.2.68</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/upgrade.html
+++ b/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.67</span></h1>
+                <h1>FilaMan<span class="version">v1.2.68</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/waage.html
+++ b/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.67</span></h1>
+                <h1>FilaMan<span class="version">v1.2.68</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/wifi.html
+++ b/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.67</span></h1>
+                <h1>FilaMan<span class="version">v1.2.68</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/platformio.ini
+++ b/platformio.ini
@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.2.67"
+version = "1.2.68"

 [env:esp32dev]
 platform = espressif32
--- a/src/bambu.h
+++ b/src/bambu.h
@ -36,4 +36,5 @@ void mqtt_loop(void * parameter);
 bool setBambuSpool(String payload);
 void bambu_restart();

+extern TaskHandle_t BambuMqttTask;
 #endif
--- a/src/ota.cpp
+++ b/src/ota.cpp
@ -3,14 +3,20 @@
 #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;

-void stopTasks() {
+void stopAllTasks() {
    // Stop all tasks
-    vTaskSuspend(NULL);
+    vTaskSuspend(RfidReaderTask);
+    vTaskSuspend(BambuMqttTask);
+    vTaskSuspend(ScaleTask);
+    //vTaskDelay(100 / portTICK_PERIOD_MS);
 }

 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
@ -21,8 +27,7 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
    static size_t spiffsSize = 0;
    static const uint32_t SPIFFS_START = 0x310000;  // SPIFFS start in full.bin
    
-    stopTasks();
-    vTaskDelay(100 / portTICK_PERIOD_MS);
+    stopAllTasks();

    if (!index) {
        // Reset static variables
--- a/src/scale.h
+++ b/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
Author	SHA1	Message	Date
Manuel Weiser	13779cc9d7	docs: update changelog for version 1.2.68 Some checks failed Release Workflow / route (push) Successful in 6s Details Release Workflow / verify-provider (push) Successful in 2s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Has been cancelled Details	2025-02-20 11:53:15 +01:00
Manuel Weiser	b6d5a8a00b	docs: update webpages for version v1.2.68	2025-02-20 11:53:15 +01:00
Manuel Weiser	f6319e79f0	fix: update stopAllTasks to suspend RfidReaderTask instead of NfcTask	2025-02-20 11:53:04 +01:00
Manuel Weiser	6f24630a7d	feat: add task handles for BambuMqttTask and ScaleTask; rename stopTasks to stopAllTasks	2025-02-20 11:52:36 +01:00