From 7da9aa811a568f7f1b67ddd6c317e2f5bd9ccf47 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 19 Dec 2016 22:55:33 +0100 Subject: [PATCH] [TARANIS/HORUS] UNEXPECTED_SHUTDOWN() macro improved following @projectkk2glider advice --- radio/src/targets/horus/board.h | 2 +- radio/src/targets/taranis/board.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h index 6fc3afeb5..83e979868 100644 --- a/radio/src/targets/horus/board.h +++ b/radio/src/targets/horus/board.h @@ -338,7 +338,7 @@ void pwrResetHandler(void); uint32_t pwrPressed(void); uint32_t pwrPressedDuration(void); #define pwroffPressed() pwrPressed() -#define UNEXPECTED_SHUTDOWN() (WAS_RESET_BY_WATCHDOG()) +#define UNEXPECTED_SHUTDOWN() (WAS_RESET_BY_WATCHDOG() || g_eeGeneral.unexpectedShutdown) // Led driver void ledOff(void); diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index 55c80cbfc..69607e79e 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -412,7 +412,7 @@ uint32_t pwrPressedDuration(void); #else uint32_t pwroffPressed(void); #endif -#define UNEXPECTED_SHUTDOWN() (g_eeGeneral.unexpectedShutdown) +#define UNEXPECTED_SHUTDOWN() (WAS_RESET_BY_WATCHDOG() || g_eeGeneral.unexpectedShutdown) // Backlight driver void backlightInit(void);