Avoid infinite loop if we fail to enable/reconfigure watchdog

pennam · aentinger · commit 679118cef0bd · 2021-06-04T12:30:03.000+02:00
diff --git a/src/utility/ota/OTA-nano-rp2040.cpp b/src/utility/ota/OTA-nano-rp2040.cpp
@@ -243,6 +243,8 @@ int rp2040_connect_onOTARequest(char const * ota_url)
 
   /* Perform the reset to reboot to SFU. */
   mbed_watchdog_trigger_reset();
+  /* If watchdog is enabled we should not reach this point */
+  NVIC_SystemReset();
 
   return static_cast<int>(OTAError::None);
 }
diff --git a/src/utility/watchdog/Watchdog.cpp b/src/utility/watchdog/Watchdog.cpp
@@ -124,11 +124,11 @@ void mbed_watchdog_trigger_reset()
 
   if (hal_watchdog_init(&cfg) == WATCHDOG_STATUS_OK) {
     is_watchdog_enabled = true;
+    while(1){}
   }
   else {
     DEBUG_WARNING("%s: watchdog could not be reconfigured", __FUNCTION__);
   }
 
-  while(1){}
 }
 #endif /* ARDUINO_ARCH_MBED */

Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,8 @@ int rp2040_connect_onOTARequest(char const * ota_url)`
`243`	`243`
`244`	`244`	`/* Perform the reset to reboot to SFU. */`
`245`	`245`	`mbed_watchdog_trigger_reset();`
	`246`	`+ /* If watchdog is enabled we should not reach this point */`
	`247`	`+ NVIC_SystemReset();`
`246`	`248`
`247`	`249`	`return static_cast<int>(OTAError::None);`
`248`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,11 +124,11 @@ void mbed_watchdog_trigger_reset()`
`124`	`124`
`125`	`125`	`if (hal_watchdog_init(&cfg) == WATCHDOG_STATUS_OK) {`
`126`	`126`	`is_watchdog_enabled = true;`
	`127`	`+ while(1){}`
`127`	`128`	`}`
`128`	`129`	`else {`
`129`	`130`	`DEBUG_WARNING("%s: watchdog could not be reconfigured", __FUNCTION__);`
`130`	`131`	`}`
`131`	`132`
`132`		`- while(1){}`
`133`	`133`	`}`
`134`	`134`	`#endif /* ARDUINO_ARCH_MBED */`