diff options
| author | Nick Choi <nikchi@users.noreply.github.com> | 2017-05-30 14:17:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-30 14:17:48 -0400 |
| commit | 2c9f846608cbf91ce936071372634194745994d0 (patch) | |
| tree | 7fc260baa3bca7ba748117e07fca8aaa186943dd /tmk_core/protocol/lufa/lufa.c | |
| parent | 5393bc6f4eee3d3cb83997e5b03d8e5a5cea85d8 (diff) | |
| parent | cb791cf6cdbcd9fd1291f36f6b1a6840753db97f (diff) | |
Merge pull request #2 from qmk/master
pull in new qmk changes
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(); |