feat(framework): upgrade to arduino core 3.0.5 / esp-idf v5.1.4+ via …

…pioarduino
tspopp · Oct 13, 2024 · 900b71c · 900b71c
1 parent 62b6f23
commit 900b71c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/AquaMQTT/platformio.ini b/AquaMQTT/platformio.ini
@@ -18,7 +18,7 @@ lib_deps =
     googletest
 
 [env:arduino_nano_esp32]
-platform = espressif32@6.8.1
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.05/platform-espressif32.zip
 board = arduino_nano_esp32
 framework = arduino
 test_framework = googletest

diff --git a/AquaMQTT/src/handler/OTA.cpp b/AquaMQTT/src/handler/OTA.cpp
@@ -1,6 +1,7 @@
 #include "handler/OTA.h"
 
 #include <ArduinoOTA.h>
+#include <esp_task_wdt.h>
 
 #include "config/Configuration.h"
 
@@ -36,6 +37,7 @@ void OTAHandler::setup()  // NOLINT(*-convert-member-functions-to-static)
             .onEnd([]() { Serial.println("\nEnd"); })
             .onProgress([](unsigned int progress, unsigned int total) {
                 Serial.printf("Progress: %u%%\r", (progress / (total / 100)));
+                esp_task_wdt_reset();
             })
             .onError([](ota_error_t error) {
                 Serial.printf("Error[%u]: ", error);

diff --git a/AquaMQTT/src/main.cpp b/AquaMQTT/src/main.cpp
@@ -21,6 +21,11 @@ OTAHandler     otaHandler;
 RTCHandler     rtcHandler;
 WifiHandler    wifiHandler;
 
+esp_task_wdt_config_t twdt_config = {
+    .timeout_ms     = WATCHDOG_TIMEOUT_S * 1000,
+    .idle_core_mask = (1 << configNUM_CORES) - 1,
+    .trigger_panic  = true,
+};
 
 void loop()
 {
@@ -44,7 +49,7 @@ void setup()
     Serial.println("REBOOT");
 
     // initialize watchdog
-    esp_task_wdt_init(WATCHDOG_TIMEOUT_S, true);
+    esp_task_wdt_init(&twdt_config);
     esp_task_wdt_add(nullptr);
 
     // setup wifi