locker98/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add BLE and EZKey module defines.

Browse Source 
Also restored serial init back to original location. Was getting junk data.
This commit is contained in:
Travis La Marr 2017-03-24 17:14:57 -04:00
parent b4ac0598fa
commit 43eee52cba
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tmk_core/common.mk
View File

@ -99,10 +99,12 @@ 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
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
endif endif
ifeq ($(strip $(ONEHAND_ENABLE)), yes) ifeq ($(strip $(ONEHAND_ENABLE)), yes)

8
tmk_core/protocol/lufa/lufa.c
View File

@ -1125,6 +1125,10 @@ int main(void)
// midi_send_noteoff(&midi_device, 0, 64, 127); // midi_send_noteoff(&midi_device, 0, 64, 127);
#endif #endif
#ifdef MODULE_ADAFRUIT_EZKEY
serial_init();
#endif
/* wait for USB startup & debug output */ /* wait for USB startup & debug output */
#ifdef WAIT_FOR_USB #ifdef WAIT_FOR_USB
@ -1173,10 +1177,6 @@ int main(void)
rgblight_task(); rgblight_task();
#endif #endif
#ifdef MODULE_ADAFRUIT_EZKEY
serial_init();
#endif
#ifdef MODULE_ADAFRUIT_BLE #ifdef MODULE_ADAFRUIT_BLE
adafruit_ble_task(); adafruit_ble_task();
#endif #endif