From 00602eff344e2d55b948039f64e1704b392624a0 Mon Sep 17 00:00:00 2001 From: Stephan Baerwolf Date: Tue, 10 Sep 2013 18:03:34 +0200 Subject: [PATCH] WORKfix: Change condition when to evaluate RAMEND In cases users do not want to wait for a watchdog to time out, they can ijmp to bootloaders reset-vector. However they need to clear MCUCSR. Signed-off-by: Stephan Baerwolf --- firmware/bootloaderconfig.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/firmware/bootloaderconfig.h b/firmware/bootloaderconfig.h index e3520b4..b4a47e4 100644 --- a/firmware/bootloaderconfig.h +++ b/firmware/bootloaderconfig.h @@ -389,7 +389,8 @@ static volatile uint8_t __BOOTLOADERENTRY_FROMSOFTWARE__bootup_MCUCSR __attribut static inline bool bootLoaderCondition(void) { - if (__BOOTLOADERENTRY_FROMSOFTWARE__bootup_MCUCSR & (_BV(WDRF))) { + if (__BOOTLOADERENTRY_FROMSOFTWARE__bootup_MCUCSR & (~(_BV(WDRF)))) { + } else { if (__BOOTLOADERENTRY_FROMSOFTWARE__bootup_RAMEND_doesmatch == (__BOOTLOADERENTRY_FROMSOFTWARE__EXPECTEDADDRESS & 0xff)) { // anything else: match - the firmware is calling the bootloader return true; -- 2.11.0