From f580c92f1778a50b7f00028e9de4363fe1626a3e Mon Sep 17 00:00:00 2001 From: technyon Date: Thu, 21 Jul 2022 20:12:22 +0200 Subject: [PATCH] revert --- WebCfgServer.cpp | 5 ----- WebCfgServer.h | 2 -- main.cpp | 9 ++------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/WebCfgServer.cpp b/WebCfgServer.cpp index f159283..2bc9250 100644 --- a/WebCfgServer.cpp +++ b/WebCfgServer.cpp @@ -829,8 +829,3 @@ void WebCfgServer::sendFontsInterMinCss() // escaped by https://www.cescaper.com/ _server.send(200, "text/plain", intercss); } - -bool WebCfgServer::otaStarted() -{ - return _ota.updateStarted(); -} diff --git a/WebCfgServer.h b/WebCfgServer.h index 96bf955..859b857 100644 --- a/WebCfgServer.h +++ b/WebCfgServer.h @@ -27,8 +27,6 @@ public: void initialize(); void update(); - bool otaStarted(); - private: bool processArgs(String& message); diff --git a/main.cpp b/main.cpp index e05c5cd..326af7e 100644 --- a/main.cpp +++ b/main.cpp @@ -94,16 +94,11 @@ void checkMillisTask(void *pvParameters) { delay(30000); - if(webCfgServer->otaStarted()) - { - return; - } - // millis() is about to overflow. Restart device to prevent problems with overflow if(millis() > restartTs) { Serial.println(F("Restart timer expired, restarting device.")); - delay(2000); + delay(200); ESP.restart(); } } @@ -117,7 +112,7 @@ void setupTasks() xTaskCreatePinnedToCore(networkTask, "ntw", 8192, NULL, 3, NULL, 1); xTaskCreatePinnedToCore(nukiTask, "nuki", 4096, NULL, 2, NULL, 1); xTaskCreatePinnedToCore(presenceDetectionTask, "prdet", 768, NULL, 5, NULL, 1); - xTaskCreatePinnedToCore(checkMillisTask, "mlchk", 640, NULL, 1, NULL, 1); + xTaskCreatePinnedToCore(checkMillisTask, "mlchk", 1024, NULL, 1, NULL, 1); } uint32_t getRandomId()