ESP32: Fix watchdog timeout handling

Moddable-OpenSource · Nov 30, 2023 · 134bd45 · 134bd45
1 parent 332340e
commit 134bd45
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 10 deletions.
diff --git a/build/devices/esp32/targets/lilygo_t_qt/sdkconfig/sdkconfig.defaults.release b/build/devices/esp32/targets/lilygo_t_qt/sdkconfig/sdkconfig.defaults.release
@@ -15,6 +15,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
 
 # CONFIG_ESP_DEBUG_STUBS_ENABLE=n
 CONFIG_ESP_TASK_WDT_PANIC=y
-CONFIG_ESP_TASK_WDT=y
+CONFIG_ESP_TASK_WDT_EN=y
+CONFIG_ESP_TASK_WDT_INIT=y
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=10
 
diff --git a/build/devices/esp32/targets/lilygo_tdisplay_s3/sdkconfig/sdkconfig.defaults.release b/build/devices/esp32/targets/lilygo_tdisplay_s3/sdkconfig/sdkconfig.defaults.release
@@ -5,7 +5,8 @@
 
 # CONFIG_ESP_DEBUG_STUBS_ENABLE=n
 CONFIG_ESP_TASK_WDT_PANIC=y
-CONFIG_ESP_TASK_WDT=y
+CONFIG_ESP_TASK_WDT_EN=y
+CONFIG_ESP_TASK_WDT_INIT=y
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=10
 
 # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=y

diff --git a/build/devices/esp32/xsProj-esp32/main/main.c b/build/devices/esp32/xsProj-esp32/main/main.c
@@ -122,7 +122,7 @@ static void debug_task(void *pvParameter)
 
 void loop_task(void *pvParameter)
 {
-#if CONFIG_ESP_TASK_WDT
+#if CONFIG_ESP_TASK_WDT_EN
 	esp_task_wdt_add(NULL);
 #endif
 

diff --git a/build/devices/esp32/xsProj-esp32c3/main/main.c b/build/devices/esp32/xsProj-esp32c3/main/main.c
@@ -141,7 +141,7 @@ static void debug_task(void *pvParameter)
 
 void loop_task(void *pvParameter)
 {
-#if CONFIG_ESP_TASK_WDT
+#if CONFIG_ESP_TASK_WDT_EN
 	esp_task_wdt_add(NULL);
 #endif
 

diff --git a/build/devices/esp32/xsProj-esp32c6/main/main.c b/build/devices/esp32/xsProj-esp32c6/main/main.c
@@ -231,7 +231,7 @@ static void debug_task(void *pvParameter)
 
 void loop_task(void *pvParameter)
 {
-#if CONFIG_ESP_TASK_WDT
+#if CONFIG_ESP_TASK_WDT_EN
 	esp_task_wdt_add(NULL);
 #endif
 

diff --git a/build/devices/esp32/xsProj-esp32h2/main/main.c b/build/devices/esp32/xsProj-esp32h2/main/main.c
@@ -231,7 +231,7 @@ static void debug_task(void *pvParameter)
 
 void loop_task(void *pvParameter)
 {
-#if CONFIG_ESP_TASK_WDT
+#if CONFIG_ESP_TASK_WDT_EN
 	esp_task_wdt_add(NULL);
 #endif
 

diff --git a/build/devices/esp32/xsProj-esp32s2/main/main.c b/build/devices/esp32/xsProj-esp32s2/main/main.c
@@ -253,7 +253,7 @@ void setup(void)
 
 void loop_task(void *pvParameter)
 {
-#if CONFIG_ESP_TASK_WDT
+#if CONFIG_ESP_TASK_WDT_EN
 	esp_task_wdt_add(NULL);
 #endif
 

diff --git a/build/devices/esp32/xsProj-esp32s3/main/main.c b/build/devices/esp32/xsProj-esp32s3/main/main.c
@@ -230,7 +230,7 @@ static void debug_task(void *pvParameter)
 
 void loop_task(void *pvParameter)
 {
-#if CONFIG_ESP_TASK_WDT
+#if CONFIG_ESP_TASK_WDT_EN
 	esp_task_wdt_add(NULL);
 #endif
 

diff --git a/xs/platforms/esp/xsHost.c b/xs/platforms/esp/xsHost.c
@@ -1030,8 +1030,15 @@ void modMessageService(xsMachine *the, int maxDelayMS)
 {
 	modMessageRecord msg;
 
-#if CONFIG_ESP_TASK_WDT
+#if CONFIG_ESP_TASK_WDT_EN
 	modWatchDogReset();
+    #ifndef CONFIG_ESP_TASK_WDT_TIMEOUT_S
+		// The default timeout is 5s, but it can be changed using this CONFIG decl as well as
+		// dynamically via esp_task_wdt_reconfigure, we assume "worst case" 1s here if it's not
+		// defined (could actually be set lower dynamically). There is no way to extract the
+		// current timeout value from esp-idf.
+		#define CONFIG_ESP_TASK_WDT_TIMEOUT_S (1)
+	#endif
 	if (maxDelayMS >= (CONFIG_ESP_TASK_WDT_TIMEOUT_S * 1000)) {
 		#if CONFIG_ESP_TASK_WDT_TIMEOUT_S <= 1
 			maxDelayMS = 500;

diff --git a/xs/platforms/esp/xsHost.h b/xs/platforms/esp/xsHost.h
@@ -300,7 +300,7 @@ double __ieee754_fmod_patch(double x, double y);
 #if !ESP32
 	#define modWatchDogReset() system_soft_wdt_feed()
 #else
-	#if CONFIG_ESP_TASK_WDT
+	#if CONFIG_ESP_TASK_WDT_EN
 		#define modWatchDogReset() esp_task_wdt_reset()
 	#else
 		#define modWatchDogReset()