zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Victor Oliveira 2020-10-11 21:31:21 -03:00 committed by Scott Lahteine
parent 2dafba1ad2
commit c1729330c5
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/HAL/STM32/watchdog.cpp
View file

@ -30,7 +30,11 @@
#include "watchdog.h" #include "watchdog.h"
#include <IWatchdog.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() { void HAL_watchdog_refresh() {
IWatchdog.reload(); IWatchdog.reload();

4
Marlin/src/HAL/STM32F1/watchdog.cpp
View file

@ -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) * @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() { 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 #endif // USE_WATCHDOG

3
Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
View file

@ -33,6 +33,9 @@
#define BOARD_INFO_NAME "Malyan M200" #define BOARD_INFO_NAME "Malyan M200"
#endif #endif
// Prevents hanging from an extra watchdog init
#define DISABLE_WATCHDOG_INIT
// Assume Flash EEPROM // Assume Flash EEPROM
#if NO_EEPROM_SELECTED #if NO_EEPROM_SELECTED
#define FLASH_EEPROM_EMULATION #define FLASH_EEPROM_EMULATION