diff --git a/include/DebugTrace.h b/include/DebugTrace.h index 64cea4be..f73bce0d 100644 --- a/include/DebugTrace.h +++ b/include/DebugTrace.h @@ -29,5 +29,5 @@ void printDebugTrace(); void sendDebugTraceAndFreeMemory(bool); void startWatchDog(); -extern "C" bool verifyRollbackLater(); +//extern "C" bool verifyRollbackLater(); void verifyFirmware(); \ No newline at end of file diff --git a/src/DebugTrace.cpp b/src/DebugTrace.cpp index e4e39adc..597fe050 100644 --- a/src/DebugTrace.cpp +++ b/src/DebugTrace.cpp @@ -305,7 +305,7 @@ void startWatchDog() extern "C" bool verifyRollbackLater() { - Serial.printf("verifyRollbackLater OVERRIDDEN FUNCTION!"); + ets_printf("[SYSTEM] - verifyRollbackLater OVERRIDDEN FUNCTION!\n"); return true; } @@ -322,25 +322,25 @@ void verifyFirmware() : ota_state == ESP_OTA_IMG_INVALID ? "ESP_OTA_IMG_INVALID" : ota_state == ESP_OTA_IMG_ABORTED ? "ESP_OTA_IMG_ABORTED" : "ESP_OTA_IMG_UNDEFINED"; - Serial.printf("[System] - Ota state: %s\n", otaState); + Serial.printf("[SYSTEM] - Ota state: %s\n", otaState); if (ota_state == ESP_OTA_IMG_PENDING_VERIFY) { if (esp_ota_mark_app_valid_cancel_rollback() == ESP_OK) { - Serial.printf("[System] - App is valid, rollback cancelled successfully\n"); + Serial.printf("[SYSTEM] - App is valid, rollback cancelled successfully\n"); } else { - Serial.printf("[System] - Failed to cancel rollback\n"); + Serial.printf("[SYSTEM] - Failed to cancel rollback\n"); } } } else { - Serial.printf("[System] - OTA partition has no record in OTA data\n"); + Serial.printf("[SYSTEM] - OTA partition has no record in OTA data\n"); } -} +} #else //ESP32 void startWatchDog() {} //extern "C" bool verifyRollbackLater() {} diff --git a/src/EspFileSystem.cpp b/src/EspFileSystem.cpp index 753f5cff..1ff8090b 100644 --- a/src/EspFileSystem.cpp +++ b/src/EspFileSystem.cpp @@ -55,7 +55,6 @@ void resetSettingsFlashByPanic() writeFile(F("/config.json"), "[]"); writeFile(F("/scenario.txt"), ""); writeFile(F("/layout.json"), "[]"); - ESP.restart(); } void syncValuesFlashJson() diff --git a/src/Main.cpp b/src/Main.cpp index c270fb37..a3ed3ac8 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -236,7 +236,7 @@ void setup() { TIMES, 1000, [&](void *) { // сброс WDT #if defined(ESP32) - SerialPrint("i", "Task", "Resetting WDT..."); + SerialPrint("i", "Task", "reset wdt"); esp_task_wdt_reset(); #endif // сохраняем значения IoTItems в файл каждую секунду, если были изменения (установлены маркеры на сохранение) diff --git a/src/utils/WiFiUtils.cpp b/src/utils/WiFiUtils.cpp index f69a7ae5..2973fde0 100644 --- a/src/utils/WiFiUtils.cpp +++ b/src/utils/WiFiUtils.cpp @@ -1,5 +1,8 @@ #include "utils/WiFiUtils.h" #include +#if defined(ESP32) +#include +#endif #define TRIESONE 25 // количество попыток подключения к одной сети из несколких #define TRIES 40 // количество попыток подключения сети если она одна /* @@ -87,6 +90,10 @@ void routerConnect() jsonWriteInt(errorsHeapJson, "passer", 1); break; } +#if defined(ESP32) + //SerialPrint("i", "Task", "Resetting WDT..."); + esp_task_wdt_reset(); +#endif Serial.print("."); delay(1000); }