diff options
| author | Florian Didron <fdidron@users.noreply.github.com> | 2019-05-20 15:48:54 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-20 15:48:54 +0900 |
| commit | 0cce8cbab0bc2cf5b4d07ca0918af3ec37fac8f6 (patch) | |
| tree | f75d7d0bcef60fda2c0407bdeaa5062a54100f44 | |
| parent | 24d05fee49bd9d86863f896d70eafd25674ec248 (diff) | |
| parent | 3ed039ed768252d64ef64865737d1cb10e8a3f2f (diff) | |
Merge pull request #47 from zsa/fix/mouse_keys
Re-fix Mousekey Movements (#5740)
| -rw-r--r-- | changelog.md | 1 | ||||
| -rw-r--r-- | tmk_core/common/mousekey.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/changelog.md b/changelog.md index 67d14eec23..89ce1af652 100644 --- a/changelog.md +++ b/changelog.md @@ -16,5 +16,6 @@ 05-05-2019 - New keycode macro (XP) for shifted character pairs using UNICODEMAP, and bugfixes/improvements 05-05-2019 - Add `LINK_TIME_OPTIMIZATION_ENABLE` to enable LTO and disable problematic features that cause LTO to fail 05-05-2019 - Fix issue with Space Cadet +05-06-2019 - More readable fix of Mousekeys issue 05-06-2019 - Changes to Split Common and OLED code 05-16-2019 - Add RGB Light Effect Range functionality diff --git a/tmk_core/common/mousekey.c b/tmk_core/common/mousekey.c index 5b85268a03..bb08576b9f 100644 --- a/tmk_core/common/mousekey.c +++ b/tmk_core/common/mousekey.c @@ -114,9 +114,9 @@ void mousekey_task(void) { /* diagonal move [1/sqrt(2)] */ if (mouse_report.x && mouse_report.y) { mouse_report.x = times_inv_sqrt2(mouse_report.x); - mouse_report.x = mouse_report.x == 0 ? 1 : mouse_report.x; + if (mouse_report.x == 0) { mouse_report.x = 1; } mouse_report.y = times_inv_sqrt2(mouse_report.y); - mouse_report.y = mouse_report.y == 0 ? 1 : mouse_report.y; + if (mouse_report.y == 0) { mouse_report.y = 1; } } if (mouse_report.v > 0) mouse_report.v = wheel_unit(); if (mouse_report.v < 0) mouse_report.v = wheel_unit() * -1; @@ -234,9 +234,9 @@ void adjust_speed(void) { // adjust for diagonals if (mouse_report.x && mouse_report.y) { mouse_report.x = times_inv_sqrt2(mouse_report.x); - mouse_report.x = mouse_report.x == 0 ? 1 : mouse_report.x; + if (mouse_report.x == 0) { mouse_report.x = 1; } mouse_report.y = times_inv_sqrt2(mouse_report.y); - mouse_report.y = mouse_report.y == 0 ? 1 : mouse_report.y; + if (mouse_report.y == 0) { mouse_report.y = 1; } } if (mouse_report.h && mouse_report.v) { mouse_report.h = times_inv_sqrt2(mouse_report.h); |