diff options
| author | Stick <nstickney@gmail.com> | 2017-06-02 19:50:54 -0500 |
|---|---|---|
| committer | Stick <nstickney@gmail.com> | 2017-06-02 19:50:54 -0500 |
| commit | 4ba9917f829885b13ea1b3610a2f988e539c9e01 (patch) | |
| tree | 612da1c6de929e6e0a5b0847d7b594cb3becdf27 /tmk_core/protocol/lufa/lufa.c | |
| parent | 8665ed3efc62e649d0eac5b88761d7b3f8f30cd7 (diff) | |
| parent | aaa67f69305c5c78e15a1090ba7058adea59ff36 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/protocol/lufa/lufa.c')
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index ae6129d1a2..e3f8724e81 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -669,7 +669,7 @@ static void send_mouse(report_mouse_t *report) if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) { #ifdef MODULE_ADAFRUIT_BLE // FIXME: mouse buttons - adafruit_ble_send_mouse_move(report->x, report->y, report->v, report->h); + adafruit_ble_send_mouse_move(report->x, report->y, report->v, report->h, report->buttons); #else bluefruit_serial_send(0xFD); bluefruit_serial_send(0x00); @@ -1180,7 +1180,7 @@ int main(void) print("Keyboard start.\n"); while (1) { - #if !defined(BLUETOOTH_ENABLE) + #if !defined(NO_USB_STARTUP_CHECK) while (USB_DeviceState == DEVICE_STATE_Suspended) { print("[s]"); suspend_power_down(); |