From 555f6510b29420041789edb66896379f1fc2a745 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Fri, 1 Apr 2016 18:58:29 +0400 Subject: [PATCH] WDT at 500ms. Needs thorough checking --- radio/src/opentx.cpp | 2 +- radio/src/opentx.h | 2 ++ radio/src/targets/horus/board_horus.h | 2 +- radio/src/targets/taranis/board_taranis.h | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index dabb7ea2c..daf92bd33 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -2649,7 +2649,7 @@ void opentxInit(OPENTX_INIT_ARGS) startPulses(); - wdt_enable(WDTO_500MS); + wdt_enable(WDT_500MS); } #if defined(SIMU) diff --git a/radio/src/opentx.h b/radio/src/opentx.h index ee0f82bfc..dfddf121b 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -1746,4 +1746,6 @@ extern JitterMeter rawJitter[NUMBER_ANALOG]; extern JitterMeter avgJitter[NUMBER_ANALOG]; #endif // defined(JITTER_MEASURE) +#define WDT_500MS 500 + #endif // _OPENTX_H_ diff --git a/radio/src/targets/horus/board_horus.h b/radio/src/targets/horus/board_horus.h index 7ee5498cb..949ae32cd 100644 --- a/radio/src/targets/horus/board_horus.h +++ b/radio/src/targets/horus/board_horus.h @@ -211,7 +211,7 @@ void watchdogInit(unsigned int duration); #define wdt_enable(x) #define wdt_reset() #else - #define wdt_enable(x) watchdogInit(1500) + #define wdt_enable(x) watchdogInit(x) #define wdt_reset() IWDG->KR = 0xAAAA #endif #define WAS_RESET_BY_WATCHDOG() (RCC->CSR & (RCC_CSR_WDGRSTF | RCC_CSR_WWDGRSTF)) diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h index 00b28505f..7399c23b9 100644 --- a/radio/src/targets/taranis/board_taranis.h +++ b/radio/src/targets/taranis/board_taranis.h @@ -233,7 +233,7 @@ void checkRotaryEncoder(void); #if !defined(SIMU) #define wdt_disable() void watchdogInit(unsigned int duration); -#define wdt_enable(x) watchdogInit(1500) +#define wdt_enable(x) watchdogInit(x) #define wdt_reset() IWDG->KR = 0xAAAA #define WAS_RESET_BY_SOFTWARE() (RCC->CSR & RCC_CSR_SFTRSTF) #define WAS_RESET_BY_WATCHDOG() (RCC->CSR & (RCC_CSR_WDGRSTF | RCC_CSR_WWDGRSTF))