Merge pull request #239 from arduino-libraries/mbed-enable-watchdog

Enable watchdog for ArduinoCore-mbed based boards

Author: aentinger

src/ArduinoIoTCloudTCP.cpp

@@ -269,28 +269,35 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
   }
 #endif /* BOARD_HAS_OFFLOADED_ECCX08 */
 
-#ifdef ARDUINO_ARCH_SAMD
   /* Since we do not control what code the user inserts
    * between ArduinoIoTCloudTCP::begin() and the first
    * call to ArduinoIoTCloudTCP::update() it is wise to
    * set a rather large timeout at first.
    */
+#ifdef ARDUINO_ARCH_SAMD
   if (enable_watchdog) {
     samd_watchdog_enable();
   }
-#endif /* ARDUINO_ARCH_SAMD */
+#elif defined(ARDUINO_ARCH_MBED)
+  if (enable_watchdog) {
+    mbed_watchdog_enable();
+  }
+#endif
 
   return 1;
 }
 
 void ArduinoIoTCloudTCP::update()
 {
-#ifdef ARDUINO_ARCH_SAMD
   /* Feed the watchdog. If any of the functions called below
    * get stuck than we can at least reset and recover.
    */
+#ifdef ARDUINO_ARCH_SAMD
   samd_watchdog_reset();
-#endif /* ARDUINO_ARCH_SAMD */
+#elif defined(ARDUINO_ARCH_MBED)
+  mbed_watchdog_reset();
+#endif
+
 
   /* Run through the state machine. */
   State next_state = _state;

src/utility/watchdog/Watchdog.cpp

@@ -21,6 +21,23 @@
 
 #include "Watchdog.h"
 
+#include <AIoTC_Config.h>
+
+#if defined(DEBUG_ERROR) || defined(DEBUG_WARNING) || defined(DEBUG_INFO) || defined(DEBUG_DEBUG) || defined(DEBUG_VERBOSE)
+#  include <Arduino_DebugUtils.h>
+#endif
+
+#ifdef ARDUINO_ARCH_SAMD
+#  include <Adafruit_SleepyDog.h>
+#  define SAMD_WATCHDOG_MAX_TIME_ms (16 * 1000)
+#endif /* ARDUINO_ARCH_SAMD */
+
+#ifdef ARDUINO_ARCH_MBED
+#  include <watchdog_api.h>
+#  define PORTENTA_H7_WATCHDOG_MAX_TIMEOUT_ms (32760)
+#  define NANO_RP2040_WATCHDOG_MAX_TIMEOUT_ms (32760)
+#endif /* ARDUINO_ARCH_MBED */
+
 /******************************************************************************
  * GLOBAL VARIABLES
  ******************************************************************************/
@@ -56,3 +73,31 @@ void wifi_nina_feed_watchdog()
   samd_watchdog_reset();
 }
 #endif /* ARDUINO_ARCH_SAMD */
+
+#ifdef ARDUINO_ARCH_MBED
+void mbed_watchdog_enable()
+{
+  watchdog_config_t cfg;
+#if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4)
+  cfg.timeout_ms = PORTENTA_H7_WATCHDOG_MAX_TIMEOUT_ms;
+#elif defined(ARDUINO_NANO_RP2040_CONNECT)
+  cfg.timeout_ms = NANO_RP2040_WATCHDOG_MAX_TIMEOUT_ms;
+#else
+# error "You need to define the maximum possible timeout for this architecture."
+#endif
+
+  if (hal_watchdog_init(&cfg) == WATCHDOG_STATUS_OK) {
+    is_watchdog_enabled = true;
+  }
+  else {
+    DEBUG_WARNING("%s: watchdog could not be enabled", __FUNCTION__);
+  }
+}
+
+void mbed_watchdog_reset()
+{
+  if (is_watchdog_enabled) {
+    hal_watchdog_kick();
+  }
+}
+#endif /* ARDUINO_ARCH_MBED */

src/utility/watchdog/Watchdog.h

@@ -18,21 +18,6 @@
 #ifndef ARDUINO_AIOTC_UTILITY_WATCHDOG_H_
 #define ARDUINO_AIOTC_UTILITY_WATCHDOG_H_
 
-/******************************************************************************
- * INCLUDE
- ******************************************************************************/
-
-#include <AIoTC_Config.h>
-
-/******************************************************************************
- * PREPROCESSOR SECTION
- ******************************************************************************/
-
-#ifdef ARDUINO_ARCH_SAMD
-#  include <Adafruit_SleepyDog.h>
-#  define SAMD_WATCHDOG_MAX_TIME_ms (16 * 1000)
-#endif /* ARDUINO_ARCH_SAMD */
-
 /******************************************************************************
  * FUNCTION DECLARATION
  ******************************************************************************/
@@ -42,4 +27,9 @@ void samd_watchdog_enable();
 void samd_watchdog_reset();
 #endif /* ARDUINO_ARCH_SAMD */
 
+#ifdef ARDUINO_ARCH_MBED
+void mbed_watchdog_enable();
+void mbed_watchdog_reset();
+#endif /* ARDUINO_ARCH_MBED */
+
 #endif /* ARDUINO_AIOTC_UTILITY_WATCHDOG_H_ */