max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: Remove unneeded code in bootloader_jump

Browse source
This commit is contained in:
tmk 2019-09-18 14:14:25 +09:00
parent 83b90f4b6f
commit bc821b79d0
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tmk_core/common/avr/bootloader.c
View file

@ -92,7 +92,6 @@ void bootloader_jump(void) {
#ifdef PROTOCOL_LUFA #ifdef PROTOCOL_LUFA
USB_Disable(); USB_Disable();
cli(); cli();
_delay_ms(2000);
#endif #endif
#ifdef PROTOCOL_PJRC #ifdef PROTOCOL_PJRC
@ -125,11 +124,10 @@ void bootloader_jump_after_watchdog_reset(void)
if ((MCUSR & (1<<WDRF)) && reset_key == BOOTLOADER_RESET_KEY) { if ((MCUSR & (1<<WDRF)) && reset_key == BOOTLOADER_RESET_KEY) {
reset_key = 0; reset_key = 0;
// My custom USBasploader requires this to come up. // some of bootloaders may need to preseve?
MCUSR = 0; MCUSR = 0;
// Seems like Teensy halfkay loader requires clearing WDRF and disabling watchdog. // disable watchdog timer
MCUSR &= ~(1<<WDRF);
wdt_disable(); wdt_disable();
#ifndef NO_BOOTLOADER_CATERINA_BOOTKEY #ifndef NO_BOOTLOADER_CATERINA_BOOTKEY