diff options
| author | zvecr <git@zvecr.com> | 2019-11-17 14:02:26 +0000 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-11-17 08:25:58 -0800 |
| commit | a91c0c476507cb8c12840abb59bff34ab0de3c03 (patch) | |
| tree | 313d9a0ec2f17c47f33305b350eef8768b5efa1c /tmk_core | |
| parent | 6b18ca2875ceb38011f32f2d17238ba55ce7ad67 (diff) | |
| download | qmk_firmware-a91c0c476507cb8c12840abb59bff34ab0de3c03.tar.gz qmk_firmware-a91c0c476507cb8c12840abb59bff34ab0de3c03.zip | |
Run clang-format manually to fix recently changed files
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/arm_atsam/suspend.c | 3 | ||||
| -rw-r--r-- | tmk_core/common/eeconfig.c | 4 | ||||
| -rw-r--r-- | tmk_core/common/host.c | 2 | ||||
| -rw-r--r-- | tmk_core/common/led.h | 10 | ||||
| -rw-r--r-- | tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h | 7 | ||||
| -rw-r--r-- | tmk_core/protocol/chibios/usb_main.c | 6 | ||||
| -rw-r--r-- | tmk_core/protocol/iwrap/iwrap.c | 3 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/adafruit_ble.cpp | 6 |
8 files changed, 22 insertions, 19 deletions
diff --git a/tmk_core/common/arm_atsam/suspend.c b/tmk_core/common/arm_atsam/suspend.c index 2dad00570..d1077be4c 100644 --- a/tmk_core/common/arm_atsam/suspend.c +++ b/tmk_core/common/arm_atsam/suspend.c | |||
| @@ -7,7 +7,8 @@ | |||
| 7 | * | 7 | * |
| 8 | * FIXME: needs doc | 8 | * FIXME: needs doc |
| 9 | */ | 9 | */ |
| 10 | void suspend_idle(uint8_t time) { /* Note: Not used anywhere currently */ } | 10 | void suspend_idle(uint8_t time) { /* Note: Not used anywhere currently */ |
| 11 | } | ||
| 11 | 12 | ||
| 12 | /** \brief Run user level Power down | 13 | /** \brief Run user level Power down |
| 13 | * | 14 | * |
diff --git a/tmk_core/common/eeconfig.c b/tmk_core/common/eeconfig.c index 72f198d6c..7cec4bd7d 100644 --- a/tmk_core/common/eeconfig.c +++ b/tmk_core/common/eeconfig.c | |||
| @@ -51,10 +51,10 @@ void eeconfig_init_quantum(void) { | |||
| 51 | // TODO: Remove once ARM has a way to configure EECONFIG_HANDEDNESS | 51 | // TODO: Remove once ARM has a way to configure EECONFIG_HANDEDNESS |
| 52 | // within the emulated eeprom via dfu-util or another tool | 52 | // within the emulated eeprom via dfu-util or another tool |
| 53 | #if defined INIT_EE_HANDS_LEFT | 53 | #if defined INIT_EE_HANDS_LEFT |
| 54 | #pragma message "Faking EE_HANDS for left hand" | 54 | # pragma message "Faking EE_HANDS for left hand" |
| 55 | eeprom_update_byte(EECONFIG_HANDEDNESS, 1); | 55 | eeprom_update_byte(EECONFIG_HANDEDNESS, 1); |
| 56 | #elif defined INIT_EE_HANDS_RIGHT | 56 | #elif defined INIT_EE_HANDS_RIGHT |
| 57 | #pragma message "Faking EE_HANDS for right hand" | 57 | # pragma message "Faking EE_HANDS for right hand" |
| 58 | eeprom_update_byte(EECONFIG_HANDEDNESS, 0); | 58 | eeprom_update_byte(EECONFIG_HANDEDNESS, 0); |
| 59 | #endif | 59 | #endif |
| 60 | 60 | ||
diff --git a/tmk_core/common/host.c b/tmk_core/common/host.c index 713b0d945..e7d92cfac 100644 --- a/tmk_core/common/host.c +++ b/tmk_core/common/host.c | |||
| @@ -41,7 +41,7 @@ uint8_t host_keyboard_leds(void) { | |||
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | led_t host_keyboard_led_state(void) { | 43 | led_t host_keyboard_led_state(void) { |
| 44 | if (!driver) return (led_t) {0}; | 44 | if (!driver) return (led_t){0}; |
| 45 | return (led_t)((*driver->keyboard_leds)()); | 45 | return (led_t)((*driver->keyboard_leds)()); |
| 46 | } | 46 | } |
| 47 | 47 | ||
diff --git a/tmk_core/common/led.h b/tmk_core/common/led.h index daf974bed..990282862 100644 --- a/tmk_core/common/led.h +++ b/tmk_core/common/led.h | |||
| @@ -36,11 +36,11 @@ extern "C" { | |||
| 36 | typedef union { | 36 | typedef union { |
| 37 | uint8_t raw; | 37 | uint8_t raw; |
| 38 | struct { | 38 | struct { |
| 39 | bool num_lock : 1; | 39 | bool num_lock : 1; |
| 40 | bool caps_lock : 1; | 40 | bool caps_lock : 1; |
| 41 | bool scroll_lock : 1; | 41 | bool scroll_lock : 1; |
| 42 | bool compose : 1; | 42 | bool compose : 1; |
| 43 | bool kana : 1; | 43 | bool kana : 1; |
| 44 | uint8_t reserved : 3; | 44 | uint8_t reserved : 3; |
| 45 | }; | 45 | }; |
| 46 | } led_t; | 46 | } led_t; |
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 | ||
| 323 | static void send_system(uint16_t data) { /* not supported */ } | 323 | static void send_system(uint16_t data) { /* not supported */ |
| 324 | } | ||
| 324 | 325 | ||
| 325 | static void send_consumer(uint16_t data) { | 326 | static 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 | ||
| 39 | static struct { | 39 | static struct { |
