diff options
| author | Luiz Ribeiro <luizribeiro@gmail.com> | 2017-01-21 23:09:17 +0100 |
|---|---|---|
| committer | Luiz Ribeiro <luizribeiro@gmail.com> | 2017-01-21 23:18:05 +0100 |
| commit | 9ce38cbccf073fccea6f7ee6492bf472a48852b8 (patch) | |
| tree | c98d5fd54bd84b1c72338a72b06490270d8b50ac /tmk_core/common/avr | |
| parent | 461dfd44621ef31cabc08136d4714ca24ed651fa (diff) | |
| download | qmk_firmware-9ce38cbccf073fccea6f7ee6492bf472a48852b8.tar.gz qmk_firmware-9ce38cbccf073fccea6f7ee6492bf472a48852b8.tar.xz | |
Simplified and polished a bit the code changes on tmk_core
Diffstat (limited to 'tmk_core/common/avr')
| -rw-r--r-- | tmk_core/common/avr/bootloader.c | 6 | ||||
| -rw-r--r-- | tmk_core/common/avr/suspend.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tmk_core/common/avr/bootloader.c b/tmk_core/common/avr/bootloader.c index 98a24d178..34db8d0b0 100644 --- a/tmk_core/common/avr/bootloader.c +++ b/tmk_core/common/avr/bootloader.c @@ -90,8 +90,10 @@ void bootloader_jump(void) { _delay_ms(5); #endif - #ifdef EEPROM_BOOTLOADER_START - eeprom_write_byte((uint8_t *)EEPROM_BOOTLOADER_START, 0x00); + #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 diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c index 0e97892d9..0c81e8361 100644 --- a/tmk_core/common/avr/suspend.c +++ b/tmk_core/common/avr/suspend.c @@ -65,7 +65,6 @@ static uint8_t wdt_timeout = 0; static void power_down(uint8_t wdto) { -#ifndef __AVR_ATmega32A__ #ifdef PROTOCOL_LUFA if (USB_DeviceState == DEVICE_STATE_Configured) return; #endif @@ -100,7 +99,6 @@ static void power_down(uint8_t wdto) // Disable watchdog after sleep wdt_disable(); -#endif } #endif |