Simplified and polished a bit the code changes on tmk_core

3 files changed, 5 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
 
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index beba768ec..f79d5a257 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -236,6 +236,7 @@ static void print_status(void)
 
     print_val_hex8(host_keyboard_leds());
 #ifndef PROTOCOL_VUSB
+    // these aren't set on the V-USB protocol, so we just ignore them for now
     print_val_hex8(keyboard_protocol);
     print_val_hex8(keyboard_idle);
 #endif