Merge pull request #4325 from microDev1/fix-wdt

dhalbert · web-flow · commit 2ae8a44b2ab2 · 2021-03-04T11:04:01.000-05:00
ESP32S2: Fix watchdog deinit
diff --git a/ports/esp32s2/common-hal/watchdog/WatchDogTimer.c b/ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
@@ -49,7 +49,7 @@ void common_hal_watchdog_feed(watchdog_watchdogtimer_obj_t *self) {
 }
 
 void common_hal_watchdog_deinit(watchdog_watchdogtimer_obj_t *self) {
-    if (esp_task_wdt_deinit() == ESP_OK) {
+    if (esp_task_wdt_delete(NULL) == ESP_OK && esp_task_wdt_deinit() == ESP_OK) {
         self->mode = WATCHDOGMODE_NONE;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ void common_hal_watchdog_feed(watchdog_watchdogtimer_obj_t *self) {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`void common_hal_watchdog_deinit(watchdog_watchdogtimer_obj_t *self) {`
`52`		`- if (esp_task_wdt_deinit() == ESP_OK) {`
	`52`	`+ if (esp_task_wdt_delete(NULL) == ESP_OK && esp_task_wdt_deinit() == ESP_OK) {`
`53`	`53`	`self->mode = WATCHDOGMODE_NONE;`
`54`	`54`	`}`
`55`	`55`	`}`