aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/common/mousekey.c
diff options
context:
space:
mode:
authorJan Christoph Ebersbach <jceb@e-jc.de>2020-12-24 23:12:19 +0100
committerGitHub <noreply@github.com>2020-12-24 14:12:19 -0800
commit010271d6ea08b58415d3ecd3e8acb37aeb4372bb (patch)
tree8d5f643a9a812b5d4f1d0e113c9a28c3fc70db9a /tmk_core/common/mousekey.c
parent4551e57d642ab406c00eccd21ecd1432dfc5819c (diff)
downloadqmk_firmware-010271d6ea08b58415d3ecd3e8acb37aeb4372bb.tar.gz
qmk_firmware-010271d6ea08b58415d3ecd3e8acb37aeb4372bb.zip
Implement kinetic mouse movement algorithm (#6739)
* Implement kinetic mouse movement algorithm * Adjust mouse wheel speed * Remove unused math.h include * Wrap mouse_timer definition in ifdef * Replace double space by single space * Clarify documentation of kinetic mouse speed Co-Authored-By: lf <software@lfcode.ca> * Clarify documentation of kinetic mouse speed Co-Authored-By: lf <software@lfcode.ca> * Remove superfluous definition of speed * fix(variable): remove unused variable Co-authored-by: lf <software@lfcode.ca>
Diffstat (limited to 'tmk_core/common/mousekey.c')
-rw-r--r--tmk_core/common/mousekey.c82
1 files changed, 80 insertions, 2 deletions
diff --git a/tmk_core/common/mousekey.c b/tmk_core/common/mousekey.c
index ef18bcf1a..697e0692c 100644
--- a/tmk_core/common/mousekey.c
+++ b/tmk_core/common/mousekey.c
@@ -36,6 +36,9 @@ static void mousekey_debug(void);
36static uint8_t mousekey_accel = 0; 36static uint8_t mousekey_accel = 0;
37static uint8_t mousekey_repeat = 0; 37static uint8_t mousekey_repeat = 0;
38static uint8_t mousekey_wheel_repeat = 0; 38static uint8_t mousekey_wheel_repeat = 0;
39#ifdef MK_KINETIC_SPEED
40static uint16_t mouse_timer = 0;
41#endif
39 42
40#ifndef MK_3_SPEED 43#ifndef MK_3_SPEED
41 44
@@ -43,7 +46,7 @@ static uint16_t last_timer_c = 0;
43static uint16_t last_timer_w = 0; 46static uint16_t last_timer_w = 0;
44 47
45/* 48/*
46 * Mouse keys acceleration algorithm 49 * Mouse keys acceleration algorithm
47 * http://en.wikipedia.org/wiki/Mouse_keys 50 * http://en.wikipedia.org/wiki/Mouse_keys
48 * 51 *
49 * speed = delta * max_speed * (repeat / time_to_max)**((1000+curve)/1000) 52 * speed = delta * max_speed * (repeat / time_to_max)**((1000+curve)/1000)
@@ -105,6 +108,69 @@ static uint8_t wheel_unit(void) {
105} 108}
106 109
107# else /* #ifndef MK_COMBINED */ 110# else /* #ifndef MK_COMBINED */
111# ifndef MK_KINETIC_SPEED
112
113/*
114 * Kinetic movement acceleration algorithm
115 *
116 * current speed = I + A * T/50 + A * 0.5 * T^2 | maximum B
117 *
118 * T: time since the mouse movement started
119 * E: mouse events per second (set through MOUSEKEY_INTERVAL, UHK sends 250, the
120 * pro micro on my Signum 3.0 sends only 125!)
121 * I: initial speed at time 0
122 * A: acceleration
123 * B: base mouse travel speed
124 */
125const uint16_t mk_accelerated_speed = MOUSEKEY_ACCELERATED_SPEED;
126const uint16_t mk_base_speed = MOUSEKEY_BASE_SPEED;
127const uint16_t mk_decelerated_speed = MOUSEKEY_DECELERATED_SPEED;
128const uint16_t mk_initial_speed = MOUSEKEY_INITIAL_SPEED;
129
130static uint8_t move_unit(void) {
131 float speed = mk_initial_speed;
132
133 if (mousekey_accel & ((1<<0) | (1<<2))) {
134 speed = mousekey_accel & (1<<2) ? mk_accelerated_speed : mk_decelerated_speed;
135 } else if (mousekey_repeat && mouse_timer) {
136 const float time_elapsed = timer_elapsed(mouse_timer) / 50;
137 speed = mk_initial_speed +
138 MOUSEKEY_MOVE_DELTA * time_elapsed +
139 MOUSEKEY_MOVE_DELTA * 0.5 * time_elapsed * time_elapsed;
140
141 speed = speed > mk_base_speed ? mk_base_speed : speed;
142 }
143
144 /* convert speed to USB mouse speed 1 to 127 */
145 speed = (uint8_t)(speed / (1000.0f / mk_interval));
146 speed = speed < 1 ? 1 : speed;
147
148 return speed > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : speed;
149}
150
151float mk_wheel_interval = 1000.0f / MOUSEKEY_WHEEL_INITIAL_MOVEMENTS;
152
153static uint8_t wheel_unit(void) {
154 float speed = MOUSEKEY_WHEEL_INITIAL_MOVEMENTS;
155
156 if (mousekey_accel & ((1<<0) | (1<<2))) {
157 speed = mousekey_accel & (1<<2) ? MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS : MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS;
158 } else if (mousekey_repeat && mouse_timer) {
159 if (mk_wheel_interval != MOUSEKEY_WHEEL_BASE_MOVEMENTS) {
160 const float time_elapsed = timer_elapsed(mouse_timer) / 50;
161 speed = MOUSEKEY_WHEEL_INITIAL_MOVEMENTS +
162 1 * time_elapsed +
163 1 * 0.5 * time_elapsed * time_elapsed;
164 }
165 speed = speed > MOUSEKEY_WHEEL_BASE_MOVEMENTS ? MOUSEKEY_WHEEL_BASE_MOVEMENTS : speed;
166 }
167
168 mk_wheel_interval = 1000.0f / speed;
169
170 return 1;
171}
172
173# else /* #ifndef MK_KINETIC_SPEED */
108 174
109static uint8_t move_unit(void) { 175static uint8_t move_unit(void) {
110 uint16_t unit; 176 uint16_t unit;
@@ -142,6 +208,7 @@ static uint8_t wheel_unit(void) {
142 return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : (unit == 0 ? 1 : unit)); 208 return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : (unit == 0 ? 1 : unit));
143} 209}
144 210
211# endif /* #ifndef MK_KINETIC_SPEED */
145# endif /* #ifndef MK_COMBINED */ 212# endif /* #ifndef MK_COMBINED */
146 213
147void mousekey_task(void) { 214void mousekey_task(void) {
@@ -193,6 +260,12 @@ void mousekey_task(void) {
193} 260}
194 261
195void mousekey_on(uint8_t code) { 262void mousekey_on(uint8_t code) {
263#ifdef MK_KINETIC_SPEED
264 if (mouse_timer == 0) {
265 mouse_timer = timer_read();
266 }
267#endif /* #ifdef MK_KINETIC_SPEED */
268
196 if (code == KC_MS_UP) 269 if (code == KC_MS_UP)
197 mouse_report.y = move_unit() * -1; 270 mouse_report.y = move_unit() * -1;
198 else if (code == KC_MS_DOWN) 271 else if (code == KC_MS_DOWN)
@@ -260,7 +333,12 @@ void mousekey_off(uint8_t code) {
260 mousekey_accel &= ~(1 << 1); 333 mousekey_accel &= ~(1 << 1);
261 else if (code == KC_MS_ACCEL2) 334 else if (code == KC_MS_ACCEL2)
262 mousekey_accel &= ~(1 << 2); 335 mousekey_accel &= ~(1 << 2);
263 if (mouse_report.x == 0 && mouse_report.y == 0) mousekey_repeat = 0; 336 if (mouse_report.x == 0 && mouse_report.y == 0) {
337 mousekey_repeat = 0;
338#ifdef MK_KINETIC_SPEED
339 mouse_timer = 0;
340#endif /* #ifdef MK_KINETIC_SPEED */
341 }
264 if (mouse_report.v == 0 && mouse_report.h == 0) mousekey_wheel_repeat = 0; 342 if (mouse_report.v == 0 && mouse_report.h == 0) mousekey_wheel_repeat = 0;
265} 343}
266 344