diff options
| author | Travis La Marr <exiva@exiva.net> | 2017-03-24 17:14:57 -0400 |
|---|---|---|
| committer | Travis La Marr <exiva@exiva.net> | 2017-03-24 17:14:57 -0400 |
| commit | 43eee52cba8db46e9f305a56ca6623428e28cc2e (patch) | |
| tree | a23a7f02ebccf3b145a741dd927ab77f09a32b2f /tmk_core/protocol | |
| parent | b4ac0598fa5a69418d79f78c0cf323307d5f5f5e (diff) | |
| download | qmk_firmware-43eee52cba8db46e9f305a56ca6623428e28cc2e.tar.gz qmk_firmware-43eee52cba8db46e9f305a56ca6623428e28cc2e.zip | |
Add BLE and EZKey module defines.
Also restored serial init back to original location. Was getting junk data.
Diffstat (limited to 'tmk_core/protocol')
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 3d7a8cc43..4cb23ebc8 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c | |||
| @@ -1125,6 +1125,10 @@ int main(void) | |||
| 1125 | // midi_send_noteoff(&midi_device, 0, 64, 127); | 1125 | // midi_send_noteoff(&midi_device, 0, 64, 127); |
| 1126 | #endif | 1126 | #endif |
| 1127 | 1127 | ||
| 1128 | #ifdef MODULE_ADAFRUIT_EZKEY | ||
| 1129 | serial_init(); | ||
| 1130 | #endif | ||
| 1131 | |||
| 1128 | /* wait for USB startup & debug output */ | 1132 | /* wait for USB startup & debug output */ |
| 1129 | 1133 | ||
| 1130 | #ifdef WAIT_FOR_USB | 1134 | #ifdef WAIT_FOR_USB |
| @@ -1173,10 +1177,6 @@ int main(void) | |||
| 1173 | rgblight_task(); | 1177 | rgblight_task(); |
| 1174 | #endif | 1178 | #endif |
| 1175 | 1179 | ||
| 1176 | #ifdef MODULE_ADAFRUIT_EZKEY | ||
| 1177 | serial_init(); | ||
| 1178 | #endif | ||
| 1179 | |||
| 1180 | #ifdef MODULE_ADAFRUIT_BLE | 1180 | #ifdef MODULE_ADAFRUIT_BLE |
| 1181 | adafruit_ble_task(); | 1181 | adafruit_ble_task(); |
| 1182 | #endif | 1182 | #endif |
