diff options
| author | Nick Brassel <nick@tzarc.org> | 2020-06-22 11:22:00 +1000 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-08-29 14:30:02 -0700 |
| commit | 60e5733c487cc0435e7d3b913f31ce4acc405d4a (patch) | |
| tree | 6a8cecf7e2de893ede5b33bdcbee6a2faa409822 /tmk_core | |
| parent | 3b34858b772cda36fa9988e4d45039ff7ff9146a (diff) | |
| download | qmk_firmware-60e5733c487cc0435e7d3b913f31ce4acc405d4a.tar.gz qmk_firmware-60e5733c487cc0435e7d3b913f31ce4acc405d4a.zip | |
`qmk cformat` on `develop` (#9501)
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/protocol/chibios/usb_main.c | 4 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c index 9d68419f4..21e9f14e5 100644 --- a/tmk_core/protocol/chibios/usb_main.c +++ b/tmk_core/protocol/chibios/usb_main.c | |||
| @@ -796,9 +796,7 @@ int8_t sendchar(uint8_t c) { | |||
| 796 | } | 796 | } |
| 797 | #endif /* CONSOLE_ENABLE */ | 797 | #endif /* CONSOLE_ENABLE */ |
| 798 | 798 | ||
| 799 | void _putchar(char character) { | 799 | void _putchar(char character) { sendchar(character); } |
| 800 | sendchar(character); | ||
| 801 | } | ||
| 802 | 800 | ||
| 803 | #ifdef RAW_ENABLE | 801 | #ifdef RAW_ENABLE |
| 804 | void raw_hid_send(uint8_t *data, uint8_t length) { | 802 | void raw_hid_send(uint8_t *data, uint8_t length) { |
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index ca3384ba2..6776a964e 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c | |||
| @@ -556,7 +556,7 @@ static void send_keyboard(report_keyboard_t *report) { | |||
| 556 | uint8_t timeout = 255; | 556 | uint8_t timeout = 255; |
| 557 | 557 | ||
| 558 | #ifdef BLUETOOTH_ENABLE | 558 | #ifdef BLUETOOTH_ENABLE |
| 559 | uint8_t where = where_to_send(); | 559 | uint8_t where = where_to_send(); |
| 560 | 560 | ||
| 561 | if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) { | 561 | if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) { |
| 562 | # ifdef MODULE_ADAFRUIT_BLE | 562 | # ifdef MODULE_ADAFRUIT_BLE |
| @@ -621,7 +621,7 @@ static void send_mouse(report_mouse_t *report) { | |||
| 621 | uint8_t timeout = 255; | 621 | uint8_t timeout = 255; |
| 622 | 622 | ||
| 623 | # ifdef BLUETOOTH_ENABLE | 623 | # ifdef BLUETOOTH_ENABLE |
| 624 | uint8_t where = where_to_send(); | 624 | uint8_t where = where_to_send(); |
| 625 | 625 | ||
| 626 | if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) { | 626 | if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) { |
| 627 | # ifdef MODULE_ADAFRUIT_BLE | 627 | # ifdef MODULE_ADAFRUIT_BLE |
