Skip to content

Commit

Permalink
qmk cformat (#10767)
Browse files Browse the repository at this point in the history
  • Loading branch information
tzarc authored and noroadsleft committed Oct 30, 2020
1 parent 75a18e6 commit 991c750
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion drivers/haptic/haptic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 1 addition & 3 deletions quantum/backlight/backlight_avr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
14 changes: 7 additions & 7 deletions tmk_core/common/action.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions tmk_core/common/report.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 991c750

Please sign in to comment.