Option to prevent (extra) Watchdog init on STM32 (MarlinFirmware#19693)

Zorchz · Oct 12, 2020 · a0f67dd · a0f67dd
1 parent e682b24
commit a0f67dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Marlin/src/HAL/STM32/watchdog.cpp b/Marlin/src/HAL/STM32/watchdog.cpp
@@ -30,7 +30,11 @@
   #include "watchdog.h"
   #include <IWatchdog.h>
 
-  void watchdog_init() { IWatchdog.begin(4000000); } // 4 sec timeout
+  void watchdog_init() {
+    #if DISABLED(DISABLE_WATCHDOG_INIT)
+      IWatchdog.begin(4000000); // 4 sec timeout
+    #endif
+  }
 
   void HAL_watchdog_refresh() {
     IWatchdog.reload();

diff --git a/Marlin/src/HAL/STM32F1/watchdog.cpp b/Marlin/src/HAL/STM32F1/watchdog.cpp
@@ -52,7 +52,9 @@ void watchdogSetup() {
  * @details The watchdog clock is 40Khz. We need a 4 seconds interval, so use a /256 preescaler and 625 reload value (counts down to 0)
  */
 void watchdog_init() {
-  //iwdg_init(IWDG_PRE_256, STM32F1_WD_RELOAD);
+  #if DISABLED(DISABLE_WATCHDOG_INIT)
+    iwdg_init(IWDG_PRE_256, STM32F1_WD_RELOAD);
+  #endif
 }
 
 #endif // USE_WATCHDOG

diff --git a/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
@@ -33,6 +33,9 @@
   #define BOARD_INFO_NAME "Malyan M200"
 #endif
 
+// Prevents hanging from an extra watchdog init
+#define DISABLE_WATCHDOG_INIT
+
 // Assume Flash EEPROM
 #if NO_EEPROM_SELECTED
   #define FLASH_EEPROM_EMULATION