diff options
| -rw-r--r-- | tmk_core/common.mk | 20 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 2 | 
2 files changed, 15 insertions, 7 deletions
| diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 3e0bd7dbc8..edec2acb4a 100644 --- 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 ae6129d1a2..3c4ad4b4d2 100644 --- 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(); | 
