From 991c75081ccf1883c3433a7c6ba2163114c8f395 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Mon, 26 Oct 2020 15:09:05 +1100 Subject: [PATCH] qmk cformat (#10767) --- drivers/haptic/haptic.c | 2 +- quantum/backlight/backlight_avr.c | 4 +--- tmk_core/common/action.c | 14 +++++++------- tmk_core/common/report.h | 4 ++-- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/haptic/haptic.c b/drivers/haptic/haptic.c index e4cf585015..de3f400527 100644 --- a/drivers/haptic/haptic.c +++ b/drivers/haptic/haptic.c @@ -40,7 +40,7 @@ void haptic_init(void) { #ifdef SOLENOID_ENABLE || (haptic_config.dwell == 0) #endif - ) { + ) { // this will be called, if the eeprom is not corrupt, // but the previous firmware didn't have haptic enabled, // or the previous firmware didn't have solenoid enabled, diff --git a/quantum/backlight/backlight_avr.c b/quantum/backlight/backlight_avr.c index f5a3b59d2e..4d66da80ba 100644 --- a/quantum/backlight/backlight_avr.c +++ b/quantum/backlight/backlight_avr.c @@ -246,9 +246,7 @@ static uint16_t cie_lightness(uint16_t v) { } // rescale the supplied backlight value to be in terms of the value limit -static uint32_t rescale_limit_val(uint32_t val) { - return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256; -} +static uint32_t rescale_limit_val(uint32_t val) { return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256; } // range for val is [0..TIMER_TOP]. PWM pin is high while the timer count is below val. static inline void set_pwm(uint16_t val) { OCRxx = val; } diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index fdb99f8c24..77da0139f2 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -230,14 +230,14 @@ void process_record_handler(keyrecord_t *record) { #if defined(PS2_MOUSE_ENABLE) || defined(POINTING_DEVICE_ENABLE) void register_button(bool pressed, enum mouse_buttons button) { - #ifdef PS2_MOUSE_ENABLE +# ifdef PS2_MOUSE_ENABLE tp_buttons = pressed ? tp_buttons | button : tp_buttons & ~button; - #endif - #ifdef POINTING_DEVICE_ENABLE +# endif +# ifdef POINTING_DEVICE_ENABLE report_mouse_t currentReport = pointing_device_get_report(); - currentReport.buttons = pressed ? currentReport.buttons | button : currentReport.buttons & ~button; + currentReport.buttons = pressed ? currentReport.buttons | button : currentReport.buttons & ~button; pointing_device_set_report(currentReport); - #endif +# endif } #endif @@ -742,9 +742,9 @@ void process_action(keyrecord_t *record, action_t action) { retro_tapping_counter = 0; } else { if ( - # ifdef RETRO_TAPPING_PER_KEY +# ifdef RETRO_TAPPING_PER_KEY get_retro_tapping(get_event_keycode(record->event, false), record) && - # endif +# endif retro_tapping_counter == 2) { tap_code(action.layer_tap.code); } diff --git a/tmk_core/common/report.h b/tmk_core/common/report.h index 2a0549ab89..610addf431 100644 --- a/tmk_core/common/report.h +++ b/tmk_core/common/report.h @@ -193,9 +193,9 @@ typedef struct { typedef struct { #if JOYSTICK_AXES_COUNT > 0 # if JOYSTICK_AXES_RESOLUTION > 8 - int16_t axes[JOYSTICK_AXES_COUNT]; + int16_t axes[JOYSTICK_AXES_COUNT]; # else - int8_t axes[JOYSTICK_AXES_COUNT]; + int8_t axes[JOYSTICK_AXES_COUNT]; # endif #endif