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
This commit is contained in:
parent
7a4ec3bd92
commit
fa1b92fbb1
@ -95,27 +95,35 @@ endif
|
|||||||
|
|
||||||
ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
|
ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
|
||||||
TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
|
TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
|
||||||
|
TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(strip $(BLUETOOTH)), AdafruitBLE)
|
ifeq ($(strip $(BLUETOOTH)), AdafruitBLE)
|
||||||
TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
|
TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
|
||||||
TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_BLE
|
TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_BLE
|
||||||
|
TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(strip $(BLUETOOTH)), AdafruitEZKey)
|
ifeq ($(strip $(BLUETOOTH)), AdafruitEZKey)
|
||||||
TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
|
TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
|
||||||
TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_EZKEY
|
TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_EZKEY
|
||||||
|
TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(strip $(BLUETOOTH)), RN42)
|
ifeq ($(strip $(BLUETOOTH)), RN42)
|
||||||
TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
|
TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
|
||||||
TMK_COMMON_DEFS += -DMODULE_RN42
|
TMK_COMMON_DEFS += -DMODULE_RN42
|
||||||
|
TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(strip $(ONEHAND_ENABLE)), yes)
|
ifeq ($(strip $(ONEHAND_ENABLE)), yes)
|
||||||
TMK_COMMON_DEFS += -DONEHAND_ENABLE
|
TMK_COMMON_DEFS += -DONEHAND_ENABLE
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(strip $(NO_USB_STARTUP_CHECK)), yes)
|
||||||
|
TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(strip $(KEYMAP_SECTION_ENABLE)), yes)
|
ifeq ($(strip $(KEYMAP_SECTION_ENABLE)), yes)
|
||||||
TMK_COMMON_DEFS += -DKEYMAP_SECTION_ENABLE
|
TMK_COMMON_DEFS += -DKEYMAP_SECTION_ENABLE
|
||||||
|
|
||||||
|
@ -1180,7 +1180,7 @@ int main(void)
|
|||||||
|
|
||||||
print("Keyboard start.\n");
|
print("Keyboard start.\n");
|
||||||
while (1) {
|
while (1) {
|
||||||
#if !defined(BLUETOOTH_ENABLE)
|
#if !defined(NO_USB_STARTUP_CHECK)
|
||||||
while (USB_DeviceState == DEVICE_STATE_Suspended) {
|
while (USB_DeviceState == DEVICE_STATE_Suspended) {
|
||||||
print("[s]");
|
print("[s]");
|
||||||
suspend_power_down();
|
suspend_power_down();
|
||||||
|
Loading…
Reference in New Issue
Block a user