aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis La Marr <exiva@exiva.net>2017-03-24 15:55:02 -0400
committerTravis La Marr <exiva@exiva.net>2017-03-24 15:55:02 -0400
commitb4ac0598fa5a69418d79f78c0cf323307d5f5f5e (patch)
tree01275cf95c23476d1b2d55d224dce9f824c2b1ef
parentddc036b69ea508750f5129d9a43fee484148716a (diff)
downloadqmk_firmware-b4ac0598fa5a69418d79f78c0cf323307d5f5f5e.tar.gz
qmk_firmware-b4ac0598fa5a69418d79f78c0cf323307d5f5f5e.zip
Readd bluetooth output direction on standard key input.
-rw-r--r--tmk_core/protocol/lufa/lufa.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index d71748ce3..3d7a8cc43 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -603,14 +603,16 @@ static void send_keyboard(report_keyboard_t *report)
603 uint8_t where = where_to_send(); 603 uint8_t where = where_to_send();
604 604
605#ifdef BLUETOOTH_ENABLE 605#ifdef BLUETOOTH_ENABLE
606 #ifdef MODULE_ADAFRUIT_BLE 606 if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) {
607 adafruit_ble_send_keys(report->mods, report->keys, sizeof(report->keys)); 607 #ifdef MODULE_ADAFRUIT_BLE
608 #else 608 adafruit_ble_send_keys(report->mods, report->keys, sizeof(report->keys));
609 bluefruit_serial_send(0xFD); 609 #else
610 for (uint8_t i = 0; i < KEYBOARD_EPSIZE; i++) { 610 bluefruit_serial_send(0xFD);
611 bluefruit_serial_send(report->raw[i]); 611 for (uint8_t i = 0; i < KEYBOARD_EPSIZE; i++) {
612 } 612 bluefruit_serial_send(report->raw[i]);
613 #endif 613 }
614 #endif
615 }
614#endif 616#endif
615 617
616 if (where != OUTPUT_USB && where != OUTPUT_USB_AND_BT) { 618 if (where != OUTPUT_USB && where != OUTPUT_USB_AND_BT) {