Update IDF to 97eecfa, enable reboot on WDT and add WDT API (#2248)

* Update IDF to 97eecfa and enable reboot on WDT * Add API to enable/disable WDT for Core 1 and Arduino Loop
espressif · Dec 28, 2018 · f49c854 · f49c854
1 parent 879388e
commit f49c854
Show file tree

Hide file tree

Showing 89 changed files with 656 additions and 395 deletions.
diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c
@@ -28,6 +28,7 @@
 #include "soc/rtc.h"
 #include "soc/rtc_cntl_reg.h"
 #include "rom/rtc.h"
+#include "esp_task_wdt.h"
 #include "esp32-hal.h"
 
 //Undocumented!!! Get chip temperature in Farenheit
@@ -44,6 +45,47 @@ void yield()
     vPortYield();
 }
 
+#if CONFIG_AUTOSTART_ARDUINO
+
+extern TaskHandle_t loopTaskHandle;
+extern bool loopTaskWDTEnabled;
+
+void enableLoopWDT(){
+    if(loopTaskHandle != NULL){
+        if(esp_task_wdt_add(loopTaskHandle) != ESP_OK){
+            log_e("Failed to add loop task to WDT");
+        } else {
+            loopTaskWDTEnabled = true;
+        }
+    }
+}
+
+void disableLoopWDT(){
+    if(loopTaskHandle != NULL && loopTaskWDTEnabled){
+        loopTaskWDTEnabled = false;
+        if(esp_task_wdt_delete(loopTaskHandle) != ESP_OK){
+            log_e("Failed to remove loop task from WDT");
+        }
+    }
+}
+#endif
+
+#ifndef CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1
+void enableCore1WDT(){
+    TaskHandle_t idle_1 = xTaskGetIdleTaskHandleForCPU(1);
+    if(idle_1 == NULL || esp_task_wdt_add(idle_1) != ESP_OK){
+        log_e("Failed to add Core 1 IDLE task to WDT");
+    }
+}
+
+void disableCore1WDT(){
+    TaskHandle_t idle_1 = xTaskGetIdleTaskHandleForCPU(1);
+    if(idle_1 == NULL || esp_task_wdt_delete(idle_1) != ESP_OK){
+        log_e("Failed to remove Core 1 IDLE task from WDT");
+    }
+}
+#endif
+
 static uint32_t _cpu_freq_mhz = CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ;
 static uint32_t _sys_time_multiplier = 1;
 

diff --git a/cores/esp32/esp32-hal.h b/cores/esp32/esp32-hal.h
@@ -72,6 +72,18 @@ void yield(void);
 //returns chip temperature in Celsius
 float temperatureRead();
 
+#if CONFIG_AUTOSTART_ARDUINO
+//enable/disable WDT for Arduino's setup and loop functions
+void enableLoopWDT();
+void disableLoopWDT();
+#endif
+
+#ifndef CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1
+//enable/disable WDT for the IDLE task on Core 1
+void enableCore1WDT();
+void disableCore1WDT();
+#endif
+
 //function takes the following frequencies as valid values:
 //  240, 160, 80                     <<< For all XTAL types
 //  40, 20, 13, 10, 8, 5, 4, 3, 2, 1 <<< For 40MHz XTAL

diff --git a/cores/esp32/main.cpp b/cores/esp32/main.cpp
@@ -1,7 +1,10 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
+#include "esp_task_wdt.h"
 #include "Arduino.h"
 
+TaskHandle_t loopTaskHandle = NULL;
+
 #if CONFIG_AUTOSTART_ARDUINO
 
 #if CONFIG_FREERTOS_UNICORE
@@ -10,18 +13,24 @@
 #define ARDUINO_RUNNING_CORE 1
 #endif
 
+bool loopTaskWDTEnabled;
+
 void loopTask(void *pvParameters)
 {
     setup();
     for(;;) {
+        if(loopTaskWDTEnabled){
+            esp_task_wdt_reset();
+        }
         loop();
     }
 }
 
 extern "C" void app_main()
 {
+    loopTaskWDTEnabled = false;
     initArduino();
-    xTaskCreatePinnedToCore(loopTask, "loopTask", 8192, NULL, 1, NULL, ARDUINO_RUNNING_CORE);
+    xTaskCreatePinnedToCore(loopTask, "loopTask", 8192, NULL, 1, &loopTaskHandle, ARDUINO_RUNNING_CORE);
 }
 
 #endif