diff options
| author | cpldcpu <cpldcpu@gmail.com> | 2013-12-28 13:56:39 +0100 |
|---|---|---|
| committer | cpldcpu <cpldcpu@gmail.com> | 2013-12-28 13:56:39 +0100 |
| commit | 2e10478426a6f0d04099bdb24fc17102a6abde1b (patch) | |
| tree | c60cf721382a7d5935688fe068a4162fdb53c1ef | |
| parent | c3de9534f78ff338031516e17f94c44480f25fed (diff) | |
| download | micronucleus-2e10478426a6f0d04099bdb24fc17102a6abde1b.tar.gz micronucleus-2e10478426a6f0d04099bdb24fc17102a6abde1b.tar.bz2 micronucleus-2e10478426a6f0d04099bdb24fc17102a6abde1b.zip | |
firmware: default is entry_always, kill warning
| -rw-r--r-- | firmware/bootloaderconfig.h | 2 | ||||
| -rw-r--r-- | firmware/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/firmware/bootloaderconfig.h b/firmware/bootloaderconfig.h index 2425e3d..392b48b 100644 --- a/firmware/bootloaderconfig.h +++ b/firmware/bootloaderconfig.h @@ -170,7 +170,7 @@ these macros are defined, the boot loader uses them. * */ -#define ENTRYMODE ENTRY_EXT_RESET +#define ENTRYMODE ENTRY_ALWAYS #define JUMPER_PIN PB0 #define JUMPER_PORT PORTB diff --git a/firmware/main.c b/firmware/main.c index 0ab0682..bafb121 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -325,7 +325,7 @@ int main(void) { idlePolls++; // Try to execute program if bootloader exit condition is met - if (AUTO_EXIT_MS&&(idlePolls>AUTO_EXIT_MS*10)) fireEvent(EVENT_EXECUTE); + if (AUTO_EXIT_MS&&(idlePolls>AUTO_EXIT_MS*10L)) fireEvent(EVENT_EXECUTE); /* main event loop runs as long as no problem is uploaded or existing program is not executed */ } while((!isEvent(EVENT_EXECUTE))||(pgm_read_byte(BOOTLOADER_ADDRESS - TINYVECTOR_RESET_OFFSET + 1)==0xff)); |