summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcpldcpu <cpldcpu@gmail.com>2013-11-18 14:14:07 +0100
committercpldcpu <cpldcpu@gmail.com>2013-11-18 14:14:07 +0100
commit902892795867a1070ede9ce0453dabc54e72cfd1 (patch)
tree90ddd91f0518f7cb17ef87402283ca3b774f6f61
parent2c68cadee6f195a0be04a2bb8fbeb4bad5a91569 (diff)
downloadmicronucleus-902892795867a1070ede9ce0453dabc54e72cfd1.tar.gz
micronucleus-902892795867a1070ede9ce0453dabc54e72cfd1.tar.bz2
micronucleus-902892795867a1070ede9ce0453dabc54e72cfd1.zip
minor
-rw-r--r--firmware/main.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/firmware/main.c b/firmware/main.c
index bd936e0..b3ecf0d 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -427,6 +427,8 @@ int main(void) {
PORTB &=~_BV(NANITE_CTRLPIN);
#endif
initForUsbConnectivity();
+
+
do {
usbPoll();
@@ -443,14 +445,14 @@ int main(void) {
if (((unsigned char*)&idlePolls)[1]&0xd) DDRB &=~_BV(NANITE_CTRLPIN);
#endif
-# if BOOTLOADER_CAN_EXIT
- if (isEvent(EVENT_EXECUTE)) { // when host requests device run uploaded program
- break;
- }
-# endif
+# if BOOTLOADER_CAN_EXIT
+ if (isEvent(EVENT_EXECUTE)) { // when host requests device run uploaded program
+ break;
+ }
+# endif
clearEvents();
-
+
} while(bootLoaderCondition()); /* main event loop runs so long as bootLoaderCondition remains truthy */
}