mirror of https://github.com/ArduPilot/ardupilot
Revert "AP_HAL_ChibiOS: disable watchdog in hwdef.h not in-line in code"
This reverts commit ccfad8ceea
.
This commit is contained in:
parent
34a55166f8
commit
b5617a9ff8
|
@ -267,7 +267,7 @@ static void main_loop()
|
|||
#if !defined(DISABLE_WATCHDOG)
|
||||
#ifdef IOMCU_FW
|
||||
stm32_watchdog_init();
|
||||
#else
|
||||
#elif !defined(HAL_BOOTLOADER_BUILD)
|
||||
// setup watchdog to reset if main loop stops
|
||||
if (AP_BoardConfig::watchdog_enabled()) {
|
||||
stm32_watchdog_init();
|
||||
|
|
|
@ -1172,7 +1172,6 @@ class ChibiOSHWDef(object):
|
|||
#define HAL_USE_EMPTY_STORAGE 1
|
||||
#ifndef HAL_STORAGE_SIZE
|
||||
#define HAL_STORAGE_SIZE 16384
|
||||
#define DISABLE_WATCHDOG 1
|
||||
#endif
|
||||
''')
|
||||
else:
|
||||
|
@ -1220,7 +1219,6 @@ class ChibiOSHWDef(object):
|
|||
#ifndef CH_CFG_USE_DYNAMIC
|
||||
#define CH_CFG_USE_DYNAMIC FALSE
|
||||
#endif
|
||||
#define DISABLE_WATCHDOG 1
|
||||
''')
|
||||
if not self.env_vars['EXT_FLASH_SIZE_MB'] and not args.signed_fw:
|
||||
f.write('''
|
||||
|
|
Loading…
Reference in New Issue