summaryrefslogtreecommitdiffstats
path: root/tmk_core
diff options
context:
space:
mode:
authorTravis La Marr <exiva@exiva.net>2017-03-24 17:14:57 -0400
committerTravis La Marr <exiva@exiva.net>2017-03-24 17:14:57 -0400
commit43eee52cba8db46e9f305a56ca6623428e28cc2e (patch)
treea23a7f02ebccf3b145a741dd927ab77f09a32b2f /tmk_core
parentb4ac0598fa5a69418d79f78c0cf323307d5f5f5e (diff)
Add BLE and EZKey module defines.
Also restored serial init back to original location. Was getting junk data.
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common.mk2
-rw-r--r--tmk_core/protocol/lufa/lufa.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 2b0fda5f2d..47f6fc5719 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -99,10 +99,12 @@ endif
ifeq ($(strip $(BLUETOOTH)), AdafruitBLE)
TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+ TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_BLE
endif
ifeq ($(strip $(BLUETOOTH)), AdafruitEZKey)
TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+ TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_EZKEY
endif
ifeq ($(strip $(ONEHAND_ENABLE)), yes)
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 3d7a8cc43e..4cb23ebc80 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -1125,6 +1125,10 @@ int main(void)
// midi_send_noteoff(&midi_device, 0, 64, 127);
#endif
+#ifdef MODULE_ADAFRUIT_EZKEY
+ serial_init();
+#endif
+
/* wait for USB startup & debug output */
#ifdef WAIT_FOR_USB
@@ -1173,10 +1177,6 @@ int main(void)
rgblight_task();
#endif
-#ifdef MODULE_ADAFRUIT_EZKEY
- serial_init();
-#endif
-
#ifdef MODULE_ADAFRUIT_BLE
adafruit_ble_task();
#endif