From 6f24630a7dc77ba09012c776e3801c6bca11fecd Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 20 Feb 2025 11:52:36 +0100 Subject: [PATCH] feat: add task handles for BambuMqttTask and ScaleTask; rename stopTasks to stopAllTasks --- src/bambu.h | 1 + src/ota.cpp | 13 +++++++++---- src/scale.h | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/bambu.h b/src/bambu.h index 12e302e..6584bff 100644 --- 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 diff --git a/src/ota.cpp b/src/ota.cpp index ea48e85..80442f1 100644 --- a/src/ota.cpp +++ b/src/ota.cpp @@ -3,14 +3,20 @@ #include #include #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(NfcTask); + 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 diff --git a/src/scale.h b/src/scale.h index d234da4..314143e 100644 --- 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 \ No newline at end of file