diff options
Diffstat (limited to 'tmk_core/common/mousekey.c')
| -rw-r--r-- | tmk_core/common/mousekey.c | 128 | 
1 files changed, 85 insertions, 43 deletions
| diff --git a/tmk_core/common/mousekey.c b/tmk_core/common/mousekey.c index ef18bcf1a8..d8cf63f771 100644 --- a/tmk_core/common/mousekey.c +++ b/tmk_core/common/mousekey.c @@ -36,6 +36,9 @@ static void           mousekey_debug(void);  static uint8_t        mousekey_accel        = 0;  static uint8_t        mousekey_repeat       = 0;  static uint8_t        mousekey_wheel_repeat = 0; +#ifdef MK_KINETIC_SPEED +static uint16_t mouse_timer = 0; +#endif  #ifndef MK_3_SPEED @@ -43,7 +46,7 @@ static uint16_t last_timer_c = 0;  static uint16_t last_timer_w = 0;  /* - * Mouse keys  acceleration algorithm + * Mouse keys acceleration algorithm   *  http://en.wikipedia.org/wiki/Mouse_keys   *   *  speed = delta * max_speed * (repeat / time_to_max)**((1000+curve)/1000) @@ -105,6 +108,65 @@ static uint8_t wheel_unit(void) {  }  #    else /* #ifndef MK_COMBINED */ +#        ifndef MK_KINETIC_SPEED + +/* + * Kinetic movement  acceleration algorithm + * + *  current speed = I + A * T/50 + A * 0.5 * T^2 | maximum B + * + * T: time since the mouse movement started + * E: mouse events per second (set through MOUSEKEY_INTERVAL, UHK sends 250, the + *    pro micro on my Signum 3.0 sends only 125!) + * I: initial speed at time 0 + * A: acceleration + * B: base mouse travel speed + */ +const uint16_t mk_accelerated_speed = MOUSEKEY_ACCELERATED_SPEED; +const uint16_t mk_base_speed        = MOUSEKEY_BASE_SPEED; +const uint16_t mk_decelerated_speed = MOUSEKEY_DECELERATED_SPEED; +const uint16_t mk_initial_speed     = MOUSEKEY_INITIAL_SPEED; + +static uint8_t move_unit(void) { +    float speed = mk_initial_speed; + +    if (mousekey_accel & ((1 << 0) | (1 << 2))) { +        speed = mousekey_accel & (1 << 2) ? mk_accelerated_speed : mk_decelerated_speed; +    } else if (mousekey_repeat && mouse_timer) { +        const float time_elapsed = timer_elapsed(mouse_timer) / 50; +        speed                    = mk_initial_speed + MOUSEKEY_MOVE_DELTA * time_elapsed + MOUSEKEY_MOVE_DELTA * 0.5 * time_elapsed * time_elapsed; + +        speed = speed > mk_base_speed ? mk_base_speed : speed; +    } + +    /* convert speed to USB mouse speed 1 to 127 */ +    speed = (uint8_t)(speed / (1000.0f / mk_interval)); +    speed = speed < 1 ? 1 : speed; + +    return speed > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : speed; +} + +float mk_wheel_interval = 1000.0f / MOUSEKEY_WHEEL_INITIAL_MOVEMENTS; + +static uint8_t wheel_unit(void) { +    float speed = MOUSEKEY_WHEEL_INITIAL_MOVEMENTS; + +    if (mousekey_accel & ((1 << 0) | (1 << 2))) { +        speed = mousekey_accel & (1 << 2) ? MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS : MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS; +    } else if (mousekey_repeat && mouse_timer) { +        if (mk_wheel_interval != MOUSEKEY_WHEEL_BASE_MOVEMENTS) { +            const float time_elapsed = timer_elapsed(mouse_timer) / 50; +            speed                    = MOUSEKEY_WHEEL_INITIAL_MOVEMENTS + 1 * time_elapsed + 1 * 0.5 * time_elapsed * time_elapsed; +        } +        speed = speed > MOUSEKEY_WHEEL_BASE_MOVEMENTS ? MOUSEKEY_WHEEL_BASE_MOVEMENTS : speed; +    } + +    mk_wheel_interval = 1000.0f / speed; + +    return 1; +} + +#        else /* #ifndef MK_KINETIC_SPEED */  static uint8_t move_unit(void) {      uint16_t unit; @@ -142,7 +204,8 @@ static uint8_t wheel_unit(void) {      return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : (unit == 0 ? 1 : unit));  } -#    endif /* #ifndef MK_COMBINED */ +#        endif /* #ifndef MK_KINETIC_SPEED */ +#    endif     /* #ifndef MK_COMBINED */  void mousekey_task(void) {      // report cursor and scroll movement independently @@ -193,6 +256,12 @@ void mousekey_task(void) {  }  void mousekey_on(uint8_t code) { +#    ifdef MK_KINETIC_SPEED +    if (mouse_timer == 0) { +        mouse_timer = timer_read(); +    } +#    endif /* #ifdef MK_KINETIC_SPEED */ +      if (code == KC_MS_UP)          mouse_report.y = move_unit() * -1;      else if (code == KC_MS_DOWN) @@ -209,16 +278,8 @@ void mousekey_on(uint8_t code) {          mouse_report.h = wheel_unit() * -1;      else if (code == KC_MS_WH_RIGHT)          mouse_report.h = wheel_unit(); -    else if (code == KC_MS_BTN1) -        mouse_report.buttons |= MOUSE_BTN1; -    else if (code == KC_MS_BTN2) -        mouse_report.buttons |= MOUSE_BTN2; -    else if (code == KC_MS_BTN3) -        mouse_report.buttons |= MOUSE_BTN3; -    else if (code == KC_MS_BTN4) -        mouse_report.buttons |= MOUSE_BTN4; -    else if (code == KC_MS_BTN5) -        mouse_report.buttons |= MOUSE_BTN5; +    else if (IS_MOUSEKEY_BUTTON(code)) +        mouse_report.buttons |= 1 << (code - KC_MS_BTN1);      else if (code == KC_MS_ACCEL0)          mousekey_accel |= (1 << 0);      else if (code == KC_MS_ACCEL1) @@ -244,23 +305,20 @@ void mousekey_off(uint8_t code) {          mouse_report.h = 0;      else if (code == KC_MS_WH_RIGHT && mouse_report.h > 0)          mouse_report.h = 0; -    else if (code == KC_MS_BTN1) -        mouse_report.buttons &= ~MOUSE_BTN1; -    else if (code == KC_MS_BTN2) -        mouse_report.buttons &= ~MOUSE_BTN2; -    else if (code == KC_MS_BTN3) -        mouse_report.buttons &= ~MOUSE_BTN3; -    else if (code == KC_MS_BTN4) -        mouse_report.buttons &= ~MOUSE_BTN4; -    else if (code == KC_MS_BTN5) -        mouse_report.buttons &= ~MOUSE_BTN5; +    else if (IS_MOUSEKEY_BUTTON(code)) +        mouse_report.buttons &= ~(1 << (code - KC_MS_BTN1));      else if (code == KC_MS_ACCEL0)          mousekey_accel &= ~(1 << 0);      else if (code == KC_MS_ACCEL1)          mousekey_accel &= ~(1 << 1);      else if (code == KC_MS_ACCEL2)          mousekey_accel &= ~(1 << 2); -    if (mouse_report.x == 0 && mouse_report.y == 0) mousekey_repeat = 0; +    if (mouse_report.x == 0 && mouse_report.y == 0) { +        mousekey_repeat = 0; +#    ifdef MK_KINETIC_SPEED +        mouse_timer = 0; +#    endif /* #ifdef MK_KINETIC_SPEED */ +    }      if (mouse_report.v == 0 && mouse_report.h == 0) mousekey_wheel_repeat = 0;  } @@ -349,16 +407,8 @@ void mousekey_on(uint8_t code) {          mouse_report.h = w_offset * -1;      else if (code == KC_MS_WH_RIGHT)          mouse_report.h = w_offset; -    else if (code == KC_MS_BTN1) -        mouse_report.buttons |= MOUSE_BTN1; -    else if (code == KC_MS_BTN2) -        mouse_report.buttons |= MOUSE_BTN2; -    else if (code == KC_MS_BTN3) -        mouse_report.buttons |= MOUSE_BTN3; -    else if (code == KC_MS_BTN4) -        mouse_report.buttons |= MOUSE_BTN4; -    else if (code == KC_MS_BTN5) -        mouse_report.buttons |= MOUSE_BTN5; +    else if (IS_MOUSEKEY_BUTTON(code)) +        mouse_report.buttons |= 1 << (code - KC_MS_BTN1);      else if (code == KC_MS_ACCEL0)          mk_speed = mkspd_0;      else if (code == KC_MS_ACCEL1) @@ -388,16 +438,8 @@ void mousekey_off(uint8_t code) {          mouse_report.h = 0;      else if (code == KC_MS_WH_RIGHT && mouse_report.h > 0)          mouse_report.h = 0; -    else if (code == KC_MS_BTN1) -        mouse_report.buttons &= ~MOUSE_BTN1; -    else if (code == KC_MS_BTN2) -        mouse_report.buttons &= ~MOUSE_BTN2; -    else if (code == KC_MS_BTN3) -        mouse_report.buttons &= ~MOUSE_BTN3; -    else if (code == KC_MS_BTN4) -        mouse_report.buttons &= ~MOUSE_BTN4; -    else if (code == KC_MS_BTN5) -        mouse_report.buttons &= ~MOUSE_BTN5; +    else if (IS_MOUSEKEY_BUTTON(code)) +        mouse_report.buttons &= ~(1 << (code - KC_MS_BTN1));  #    ifdef MK_MOMENTARY_ACCEL      else if (code == KC_MS_ACCEL0)          mk_speed = mkspd_DEFAULT; | 
