diff options
Diffstat (limited to 'quantum/process_keycode')
| -rw-r--r-- | quantum/process_keycode/process_auto_shift.c | 35 | ||||
| -rw-r--r-- | quantum/process_keycode/process_combo.c | 4 | ||||
| -rw-r--r-- | quantum/process_keycode/process_joystick.c | 42 | 
3 files changed, 37 insertions, 44 deletions
| diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c index 330037cefb..b1267922ce 100644 --- a/quantum/process_keycode/process_auto_shift.c +++ b/quantum/process_keycode/process_auto_shift.c @@ -41,34 +41,34 @@ void autoshift_flush(void) {  }  void autoshift_on(uint16_t keycode) { -  autoshift_time    = timer_read(); -  autoshift_lastkey = keycode; +    autoshift_time    = timer_read(); +    autoshift_lastkey = keycode;  }  void autoshift_toggle(void) { -  if (autoshift_enabled) { -    autoshift_enabled = false; -    autoshift_flush(); -  } else { -    autoshift_enabled = true; -  } +    if (autoshift_enabled) { +        autoshift_enabled = false; +        autoshift_flush(); +    } else { +        autoshift_enabled = true; +    }  }  void autoshift_enable(void) { autoshift_enabled = true; }  void autoshift_disable(void) { -  autoshift_enabled = false; -  autoshift_flush(); +    autoshift_enabled = false; +    autoshift_flush();  } -#ifndef AUTO_SHIFT_NO_SETUP +#    ifndef AUTO_SHIFT_NO_SETUP  void autoshift_timer_report(void) { -  char display[8]; +    char display[8]; -  snprintf(display, 8, "\n%d\n", autoshift_timeout); +    snprintf(display, 8, "\n%d\n", autoshift_timeout); -  send_string((const char *)display); +    send_string((const char *)display);  } -#endif +#    endif  bool get_autoshift_state(void) { return autoshift_enabled; } @@ -79,7 +79,6 @@ void set_autoshift_timeout(uint16_t timeout) { autoshift_timeout = timeout; }  bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {      if (record->event.pressed) {          switch (keycode) { -              case KC_ASTG:                  autoshift_toggle();                  return true; @@ -92,10 +91,10 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {                  return true;  #    ifndef AUTO_SHIFT_NO_SETUP -                case KC_ASUP: +            case KC_ASUP:                  autoshift_timeout += 5;                  return true; -                case KC_ASDN: +            case KC_ASDN:                  autoshift_timeout -= 5;                  return true; diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c index 1f715f43b9..f38d7d47a0 100644 --- a/quantum/process_keycode/process_combo.c +++ b/quantum/process_keycode/process_combo.c @@ -27,7 +27,7 @@ extern int      COMBO_LEN;  __attribute__((weak)) void process_combo_event(uint16_t combo_index, bool pressed) {}  static uint16_t timer               = 0; -static uint16_t  current_combo_index = 0; +static uint16_t current_combo_index = 0;  static bool     drop_buffer         = false;  static bool     is_active           = false;  static bool     b_combo_enable      = true;  // defaults to enabled @@ -82,7 +82,7 @@ static inline void dump_key_buffer(bool emit) {      } while (0)  static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *record) { -    uint8_t count = 0; +    uint8_t  count = 0;      uint16_t index = -1;      /* Find index of keycode and number of combo keys */      for (const uint16_t *keys = combo->keys;; ++count) { diff --git a/quantum/process_keycode/process_joystick.c b/quantum/process_keycode/process_joystick.c index c12f756854..5778a7434c 100644 --- a/quantum/process_keycode/process_joystick.c +++ b/quantum/process_keycode/process_joystick.c @@ -17,8 +17,7 @@ bool process_joystick(uint16_t keycode, keyrecord_t *record) {      return true;  } -__attribute__((weak)) -void joystick_task(void) { +__attribute__((weak)) void joystick_task(void) {      if (process_joystick_analogread() && (joystick_status.status & JS_UPDATED)) {          send_joystick_packet(&joystick_status);          joystick_status.status &= ~JS_UPDATED; @@ -47,16 +46,11 @@ uint16_t savePinState(pin_t pin) {      return ((PORTx_ADDRESS(pin) >> pinNumber) & 0x1) << 1 | ((DDRx_ADDRESS(pin) >> pinNumber) & 0x1);  #elif defined(PROTOCOL_CHIBIOS)      /* -    The pin configuration is backed up in the following format :  +    The pin configuration is backed up in the following format :   bit  15    9  8   7   6  5  4   3     2    1 0        |unused|ODR|IDR|PUPDR|OSPEEDR|OTYPER|MODER|      */ -    return  (( PAL_PORT(pin)->MODER   >> (2*PAL_PAD(pin))) & 0x3) -          | (((PAL_PORT(pin)->OTYPER  >> (1*PAL_PAD(pin))) & 0x1) << 2)  -          | (((PAL_PORT(pin)->OSPEEDR >> (2*PAL_PAD(pin))) & 0x3) << 3) -          | (((PAL_PORT(pin)->PUPDR   >> (2*PAL_PAD(pin))) & 0x3) << 5) -          | (((PAL_PORT(pin)->IDR     >> (1*PAL_PAD(pin))) & 0x1) << 7) -          | (((PAL_PORT(pin)->ODR     >> (1*PAL_PAD(pin))) & 0x1) << 8); +    return ((PAL_PORT(pin)->MODER >> (2 * PAL_PAD(pin))) & 0x3) | (((PAL_PORT(pin)->OTYPER >> (1 * PAL_PAD(pin))) & 0x1) << 2) | (((PAL_PORT(pin)->OSPEEDR >> (2 * PAL_PAD(pin))) & 0x3) << 3) | (((PAL_PORT(pin)->PUPDR >> (2 * PAL_PAD(pin))) & 0x3) << 5) | (((PAL_PORT(pin)->IDR >> (1 * PAL_PAD(pin))) & 0x1) << 7) | (((PAL_PORT(pin)->ODR >> (1 * PAL_PAD(pin))) & 0x1) << 8);  #else      return 0;  #endif @@ -68,12 +62,12 @@ void restorePinState(pin_t pin, uint16_t restoreState) {      PORTx_ADDRESS(pin) = (PORTx_ADDRESS(pin) & ~_BV(pinNumber)) | (((restoreState >> 1) & 0x1) << pinNumber);      DDRx_ADDRESS(pin)  = (DDRx_ADDRESS(pin) & ~_BV(pinNumber)) | ((restoreState & 0x1) << pinNumber);  #elif defined(PROTOCOL_CHIBIOS) -    PAL_PORT(pin)->MODER  =  (PAL_PORT(pin)->MODER   & ~(0x3<< (2*PAL_PAD(pin)))) | (restoreState & 0x3)     << (2*PAL_PAD(pin)); -    PAL_PORT(pin)->OTYPER =  (PAL_PORT(pin)->OTYPER  & ~(0x1<< (1*PAL_PAD(pin)))) | ((restoreState>>2) & 0x1) << (1*PAL_PAD(pin)); -    PAL_PORT(pin)->OSPEEDR=  (PAL_PORT(pin)->OSPEEDR & ~(0x3<< (2*PAL_PAD(pin)))) | ((restoreState>>3) & 0x3) << (2*PAL_PAD(pin)); -    PAL_PORT(pin)->PUPDR  =  (PAL_PORT(pin)->PUPDR   & ~(0x3<< (2*PAL_PAD(pin)))) | ((restoreState>>5) & 0x3) << (2*PAL_PAD(pin)); -    PAL_PORT(pin)->IDR    =  (PAL_PORT(pin)->IDR     & ~(0x1<< (1*PAL_PAD(pin)))) | ((restoreState>>7) & 0x1) << (1*PAL_PAD(pin)); -    PAL_PORT(pin)->ODR    =  (PAL_PORT(pin)->ODR     & ~(0x1<< (1*PAL_PAD(pin)))) | ((restoreState>>8) & 0x1) << (1*PAL_PAD(pin)); +    PAL_PORT(pin)->MODER   = (PAL_PORT(pin)->MODER & ~(0x3 << (2 * PAL_PAD(pin)))) | (restoreState & 0x3) << (2 * PAL_PAD(pin)); +    PAL_PORT(pin)->OTYPER  = (PAL_PORT(pin)->OTYPER & ~(0x1 << (1 * PAL_PAD(pin)))) | ((restoreState >> 2) & 0x1) << (1 * PAL_PAD(pin)); +    PAL_PORT(pin)->OSPEEDR = (PAL_PORT(pin)->OSPEEDR & ~(0x3 << (2 * PAL_PAD(pin)))) | ((restoreState >> 3) & 0x3) << (2 * PAL_PAD(pin)); +    PAL_PORT(pin)->PUPDR   = (PAL_PORT(pin)->PUPDR & ~(0x3 << (2 * PAL_PAD(pin)))) | ((restoreState >> 5) & 0x3) << (2 * PAL_PAD(pin)); +    PAL_PORT(pin)->IDR     = (PAL_PORT(pin)->IDR & ~(0x1 << (1 * PAL_PAD(pin)))) | ((restoreState >> 7) & 0x1) << (1 * PAL_PAD(pin)); +    PAL_PORT(pin)->ODR     = (PAL_PORT(pin)->ODR & ~(0x1 << (1 * PAL_PAD(pin)))) | ((restoreState >> 8) & 0x1) << (1 * PAL_PAD(pin));  #else      return;  #endif @@ -132,21 +126,21 @@ bool process_joystick_analogread_quantum() {          int16_t axis_val = joystick_axes[axis_index].mid_digit;  #    endif -        //test the converted value against the lower range -        int32_t ref = joystick_axes[axis_index].mid_digit; -        int32_t range = joystick_axes[axis_index].min_digit; -        int32_t ranged_val = ((axis_val - ref) * -127) / (range - ref) ; +        // test the converted value against the lower range +        int32_t ref        = joystick_axes[axis_index].mid_digit; +        int32_t range      = joystick_axes[axis_index].min_digit; +        int32_t ranged_val = ((axis_val - ref) * -127) / (range - ref);          if (ranged_val > 0) { -            //the value is in the higher range -            range = joystick_axes[axis_index].max_digit; +            // the value is in the higher range +            range      = joystick_axes[axis_index].max_digit;              ranged_val = ((axis_val - ref) * 127) / (range - ref);          } -         -        //clamp the result in the valid range + +        // clamp the result in the valid range          ranged_val = ranged_val < -127 ? -127 : ranged_val;          ranged_val = ranged_val > 127 ? 127 : ranged_val; -         +          if (ranged_val != joystick_status.axes[axis_index]) {              joystick_status.axes[axis_index] = ranged_val;              joystick_status.status |= JS_UPDATED; | 
