Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "AP_HAL_ChibiOS: disable watchdog in hwdef.h not in-line in code" 

This reverts commit ccfad8ceea.
This commit is contained in:
bugobliterator 2023-05-22 16:31:10 +10:00 committed by Peter Barker
parent 34a55166f8
commit b5617a9ff8
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_ChibiOS/HAL_ChibiOS_Class.cpp
View File

@ -267,7 +267,7 @@ static void main_loop()
#if !defined(DISABLE_WATCHDOG) #if !defined(DISABLE_WATCHDOG)
#ifdef IOMCU_FW #ifdef IOMCU_FW
stm32_watchdog_init(); stm32_watchdog_init();
#else #elif !defined(HAL_BOOTLOADER_BUILD)
// setup watchdog to reset if main loop stops // setup watchdog to reset if main loop stops
if (AP_BoardConfig::watchdog_enabled()) { if (AP_BoardConfig::watchdog_enabled()) {
stm32_watchdog_init(); stm32_watchdog_init();

2
libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
View File

@ -1172,7 +1172,6 @@ class ChibiOSHWDef(object):
#define HAL_USE_EMPTY_STORAGE 1 #define HAL_USE_EMPTY_STORAGE 1
#ifndef HAL_STORAGE_SIZE #ifndef HAL_STORAGE_SIZE
#define HAL_STORAGE_SIZE 16384 #define HAL_STORAGE_SIZE 16384
#define DISABLE_WATCHDOG 1
#endif #endif
''') ''')
else: else:
@ -1220,7 +1219,6 @@ class ChibiOSHWDef(object):
#ifndef CH_CFG_USE_DYNAMIC #ifndef CH_CFG_USE_DYNAMIC
#define CH_CFG_USE_DYNAMIC FALSE #define CH_CFG_USE_DYNAMIC FALSE
#endif #endif
#define DISABLE_WATCHDOG 1
''') ''')
if not self.env_vars['EXT_FLASH_SIZE_MB'] and not args.signed_fw: if not self.env_vars['EXT_FLASH_SIZE_MB'] and not args.signed_fw:
f.write(''' f.write('''