diff options
author | Damien <Dbroqua@users.noreply.github.com> | 2017-01-26 09:05:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-26 09:05:55 +0100 |
commit | b7b94bfb132aa5f2f79b587fcfa6b1197485db27 (patch) | |
tree | 4cae966728b7b6baf101a7ab2b95eeff16cce141 /tmk_core/common/avr/bootloader.c | |
parent | f91f0a715d51286064bfe808b0d463878a6d3588 (diff) | |
parent | aac7c0aa4db6b27f4c8d8f3849f8fd41f07e892a (diff) |
Merge pull request #17 from qmk/master
Merged from QMK project
Diffstat (limited to 'tmk_core/common/avr/bootloader.c')
-rw-r--r-- | tmk_core/common/avr/bootloader.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tmk_core/common/avr/bootloader.c b/tmk_core/common/avr/bootloader.c index ad547b9853..34db8d0b0a 100644 --- a/tmk_core/common/avr/bootloader.c +++ b/tmk_core/common/avr/bootloader.c @@ -1,6 +1,7 @@ #include <stdint.h> #include <stdbool.h> #include <avr/io.h> +#include <avr/eeprom.h> #include <avr/interrupt.h> #include <avr/wdt.h> #include <util/delay.h> @@ -89,6 +90,12 @@ void bootloader_jump(void) { _delay_ms(5); #endif + #ifdef BOOTLOADHID_BOOTLOADER + // force bootloadHID to stay in bootloader mode, so that it waits + // for a new firmware to be flashed + eeprom_write_byte((uint8_t *)1, 0x00); + #endif + // watchdog reset reset_key = BOOTLOADER_RESET_KEY; wdt_enable(WDTO_250MS); @@ -114,6 +121,11 @@ void bootloader_jump(void) { #endif } +#ifdef __AVR_ATmega32A__ +// MCUSR is actually called MCUCSR in ATmega32A +#define MCUSR MCUCSR +#endif + /* this runs before main() */ void bootloader_jump_after_watchdog_reset(void) __attribute__ ((used, naked, section (".init3"))); void bootloader_jump_after_watchdog_reset(void) |