Merge remote-tracking branch 'origin/master' into develop

2021-03-25 12:11:36 +00:00
parent f2729e8974 816f2f9cc2
commit 2df1b124a7
32 changed files with 1465 additions and 1 deletions
--- a/quantum/mousekey.c
+++ b/quantum/mousekey.c
@@ -108,7 +108,7 @@ static uint8_t wheel_unit(void) {
 }

 #    else /* #ifndef MK_COMBINED */
-#        ifndef MK_KINETIC_SPEED
+#        ifdef MK_KINETIC_SPEED

 /*
 * Kinetic movement  acceleration algorithm