Add BLE and EZKey module defines.

Also restored serial init back to original location. Was getting junk data.

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 2b0fda5f2d09d1dcc20d7d692574fde6601bf1d8..47f6fc5719fc85933348c3333ed53cf0c4d633e5 100644 (file)
--- 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 3d7a8cc43e93f9a1fb1331c81c3b1fe01d1affd1..4cb23ebc80bae5446e063bceb344f6637f6b5b01 100644 (file)
--- 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