summaryrefslogtreecommitdiffstats
path: root/firmware/bootloaderconfig.h
diff options
context:
space:
mode:
authorJenna Fox <a@creativepony.com>2012-09-25 00:36:15 +1000
committerJenna Fox <a@creativepony.com>2012-09-25 00:36:15 +1000
commit2b80821ecbada3d3729d7e29080ee9b0e654e558 (patch)
tree305b35dea3ac0cee0a0b543126e74c39627f20b9 /firmware/bootloaderconfig.h
parentd38f05990696fdaea8f8d95bcd5c8bb86f97ae81 (diff)
downloadmicronucleus-2b80821ecbada3d3729d7e29080ee9b0e654e558.tar.gz
micronucleus-2b80821ecbada3d3729d7e29080ee9b0e654e558.tar.bz2
micronucleus-2b80821ecbada3d3729d7e29080ee9b0e654e558.zip
Crammed bootloader up against the edge while keeping it aligned to a page (I hope!)
Diffstat (limited to 'firmware/bootloaderconfig.h')
-rw-r--r--firmware/bootloaderconfig.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/bootloaderconfig.h b/firmware/bootloaderconfig.h
index 3b9863d..772c01b 100644
--- a/firmware/bootloaderconfig.h
+++ b/firmware/bootloaderconfig.h
@@ -203,7 +203,10 @@ these macros are defined, the boot loader uses them.
/* max 6200ms to not overflow idlePolls variable */
#define AUTO_EXIT_MS 5000
-#define AUTO_EXIT_CONDITION() (idlePolls > (AUTO_EXIT_MS * 10UL))
+//#define AUTO_EXIT_CONDITION() (idlePolls > (AUTO_EXIT_MS * 10UL))
+
+
+#define bootLoaderCondition() (idlePolls < (AUTO_EXIT_MS * 10UL))
/* ----------------------- Optional MCU Description ------------------------ */
@@ -242,9 +245,6 @@ static inline void bootLoaderExit(void)
#endif
}
-
-#define bootLoaderCondition() 1
-
#endif /* __ASSEMBLER__ */
/* ------------------------------------------------------------------------- */