]> git.friedersdorff.com Git - max/tmk_keyboard.git/commitdiff
core: Remove unneeded code in bootloader_jump
authortmk <hasu@tmk-kbd.com>
Wed, 18 Sep 2019 05:14:25 +0000 (14:14 +0900)
committertmk <hasu@tmk-kbd.com>
Wed, 18 Sep 2019 05:14:25 +0000 (14:14 +0900)
tmk_core/common/avr/bootloader.c

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