aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'tmk_core/protocol')
-rw-r--r--tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h7
-rw-r--r--tmk_core/protocol/chibios/usb_main.c6
-rw-r--r--tmk_core/protocol/iwrap/iwrap.c3
-rw-r--r--tmk_core/protocol/lufa/adafruit_ble.cpp6
4 files changed, 12 insertions, 10 deletions
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h b/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h
index 2f8a39bdd..fb97f63ce 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h
@@ -186,9 +186,10 @@ COMPILER_PACK_RESET()
186#define USB_HID_COUNTRY_UK 32 // UK 186#define USB_HID_COUNTRY_UK 32 // UK
187#define USB_HID_COUNTRY_US 33 // US 187#define USB_HID_COUNTRY_US 33 // US
188#define USB_HID_COUNTRY_YUGOSLAVIA 34 // Yugoslavia 188#define USB_HID_COUNTRY_YUGOSLAVIA 34 // Yugoslavia
189#define USB_HID_COUNTRY_TURKISH_F 35 // Turkish-F 189#define USB_HID_COUNTRY_TURKISH_F \
190 //! @} 190 35 // Turkish-F
191 //! @} 191 //! @}
192 //! @}
192//! @} 193//! @}
193 194
194//! \name HID KEYS values 195//! \name HID KEYS values
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index f7bfa20b2..b90bcd037 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -310,7 +310,7 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
310 case USB_EVENT_SUSPEND: 310 case USB_EVENT_SUSPEND:
311#ifdef SLEEP_LED_ENABLE 311#ifdef SLEEP_LED_ENABLE
312 sleep_led_enable(); 312 sleep_led_enable();
313#endif /* SLEEP_LED_ENABLE */ 313#endif /* SLEEP_LED_ENABLE */
314 /* Falls into.*/ 314 /* Falls into.*/
315 case USB_EVENT_UNCONFIGURED: 315 case USB_EVENT_UNCONFIGURED:
316 /* Falls into.*/ 316 /* Falls into.*/
@@ -453,9 +453,9 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
453#ifdef NKRO_ENABLE 453#ifdef NKRO_ENABLE
454 keymap_config.nkro = !!keyboard_protocol; 454 keymap_config.nkro = !!keyboard_protocol;
455 if (!keymap_config.nkro && keyboard_idle) { 455 if (!keymap_config.nkro && keyboard_idle) {
456#else /* NKRO_ENABLE */ 456#else /* NKRO_ENABLE */
457 if (keyboard_idle) { 457 if (keyboard_idle) {
458#endif /* NKRO_ENABLE */ 458#endif /* NKRO_ENABLE */
459 /* arm the idle timer if boot protocol & idle */ 459 /* arm the idle timer if boot protocol & idle */
460 osalSysLockFromISR(); 460 osalSysLockFromISR();
461 chVTSetI(&keyboard_idle_timer, 4 * MS2ST(keyboard_idle), keyboard_idle_timer_cb, (void *)usbp); 461 chVTSetI(&keyboard_idle_timer, 4 * MS2ST(keyboard_idle), keyboard_idle_timer_cb, (void *)usbp);
diff --git a/tmk_core/protocol/iwrap/iwrap.c b/tmk_core/protocol/iwrap/iwrap.c
index 05e632da3..4d0ca5756 100644
--- a/tmk_core/protocol/iwrap/iwrap.c
+++ b/tmk_core/protocol/iwrap/iwrap.c
@@ -320,7 +320,8 @@ static void send_mouse(report_mouse_t *report) {
320#endif 320#endif
321} 321}
322 322
323static void send_system(uint16_t data) { /* not supported */ } 323static void send_system(uint16_t data) { /* not supported */
324}
324 325
325static void send_consumer(uint16_t data) { 326static void send_consumer(uint16_t data) {
326#ifdef EXTRAKEY_ENABLE 327#ifdef EXTRAKEY_ENABLE
diff --git a/tmk_core/protocol/lufa/adafruit_ble.cpp b/tmk_core/protocol/lufa/adafruit_ble.cpp
index 505794a80..7b3ffdef7 100644
--- a/tmk_core/protocol/lufa/adafruit_ble.cpp
+++ b/tmk_core/protocol/lufa/adafruit_ble.cpp
@@ -31,9 +31,9 @@
31#define ConnectionUpdateInterval 1000 /* milliseconds */ 31#define ConnectionUpdateInterval 1000 /* milliseconds */
32 32
33#ifdef SAMPLE_BATTERY 33#ifdef SAMPLE_BATTERY
34#ifndef BATTERY_LEVEL_PIN 34# ifndef BATTERY_LEVEL_PIN
35# define BATTERY_LEVEL_PIN 7 35# define BATTERY_LEVEL_PIN 7
36#endif 36# endif
37#endif 37#endif
38 38
39static struct { 39static struct {