diff options
| author | TerryMathews <terry@terrymathews.net> | 2017-04-08 00:30:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-08 00:30:54 -0400 |
| commit | 3899bec4b603a0880055c60df534c5a86ad44a52 (patch) | |
| tree | dd3ac70f403290fafff4bf8005925a3d5eed69cd /tmk_core/common/avr/bootloader.c | |
| parent | 2a2be010d9d8c10d872c01637f4b4cd263f9bc1b (diff) | |
| parent | 154305ce1be16b2c8abce5e5d4dee421f295d6b3 (diff) | |
Merge pull request #1 from qmk/master
Catchup
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) |