Use variable to disable usb check at startup

Adds a define variable which when defined disables the usb startup
check. Modified the makefile to separate above define from bluetooth
dependancy

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 3e0bd7dbc8692fbe1cedf8ca021c0fbe76d4f3f8..edec2acb4a3b83c57610fd539c9626c6341bb6d5 100644 (file)
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -95,27 +95,35 @@ endif
 
 ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+       TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
 ifeq ($(strip $(BLUETOOTH)), AdafruitBLE)
-               TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
-               TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_BLE
+       TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+       TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_BLE
+       TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
 ifeq ($(strip $(BLUETOOTH)), AdafruitEZKey)
-               TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
-               TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_EZKEY
+       TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+       TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_EZKEY
+    TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
 ifeq ($(strip $(BLUETOOTH)), RN42)
-               TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
-               TMK_COMMON_DEFS += -DMODULE_RN42
+       TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+       TMK_COMMON_DEFS += -DMODULE_RN42
+       TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
 ifeq ($(strip $(ONEHAND_ENABLE)), yes)
     TMK_COMMON_DEFS += -DONEHAND_ENABLE
 endif
 
+ifeq ($(strip $(NO_USB_STARTUP_CHECK)), yes)
+    TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
+endif
+
 ifeq ($(strip $(KEYMAP_SECTION_ENABLE)), yes)
     TMK_COMMON_DEFS += -DKEYMAP_SECTION_ENABLE
 

diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index ae6129d1a28dfe185129cbef44abdb4d2424f35d..3c4ad4b4d2a6ebf77c1d90db4fcdf6475608c10e 100644 (file)
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -1180,7 +1180,7 @@ int main(void)
 
     print("Keyboard start.\n");
     while (1) {
-        #if !defined(BLUETOOTH_ENABLE)
+        #if !defined(NO_USB_STARTUP_CHECK)
         while (USB_DeviceState == DEVICE_STATE_Suspended) {
             print("[s]");
             suspend_power_down();