summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2022-03-25 16:31:52 -0700
committerDrashna Jael're <drashna@live.com>2022-03-25 16:31:52 -0700
commit07a3743e878e92a9236736a65d167de26478def6 (patch)
tree4293dd7c12bfdb193519621ac4887291d32081f5 /tmk_core
parent53ff570bf068e04740f187163774327839dfa68b (diff)
Fix compilation issues
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/protocol/lufa/lufa.c32
1 files changed, 1 insertions, 31 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 7075cb92d7..bf005d519f 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -882,39 +882,12 @@ static void send_system(uint16_t data) {
static void send_consumer(uint16_t data) {
#ifdef EXTRAKEY_ENABLE
# ifdef BLUETOOTH_ENABLE
-<<<<<<< HEAD
- uint8_t where = where_to_send();
-
- if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) {
-=======
if (where_to_send() == OUTPUT_BLUETOOTH) {
-<<<<<<< HEAD
->>>>>>> 0.12.52~1
-# ifdef MODULE_ADAFRUIT_BLE
- adafruit_ble_send_consumer_key(data);
-# elif MODULE_RN42
- static uint16_t last_data = 0;
- if (data == last_data) return;
- last_data = data;
- uint16_t bitmap = CONSUMER2RN42(data);
- serial_send(0xFD);
- serial_send(0x03);
- serial_send(0x03);
- serial_send(bitmap & 0xFF);
- serial_send((bitmap >> 8) & 0xFF);
-=======
# ifdef BLUETOOTH_BLUEFRUIT_LE
bluefruit_le_send_consumer_key(data);
# elif BLUETOOTH_RN42
rn42_send_consumer(data);
->>>>>>> qmk/master
# endif
-<<<<<<< HEAD
- }
-
- if (where != OUTPUT_USB && where != OUTPUT_USB_AND_BT) {
-=======
->>>>>>> 0.12.52~1
return;
}
# endif
@@ -923,6 +896,7 @@ static void send_consumer(uint16_t data) {
#endif
}
+
static void send_programmable_button(uint32_t data) {
#ifdef PROGRAMMABLE_BUTTON_ENABLE
static report_programmable_button_t r;
@@ -941,11 +915,7 @@ static void send_programmable_button(uint32_t data) {
* FIXME: Needs doc
*/
int8_t sendchar(uint8_t c) {
-<<<<<<< HEAD
- // Not wait once timeouted.
-=======
// Do not wait if the previous write has timed_out.
->>>>>>> 0.12.52~1
// Because sendchar() is called so many times, waiting each call causes big lag.
// The `timed_out` state is an approximation of the ideal `is_listener_disconnected?` state.
static bool timed_out = false;