Merge remote-tracking branch 'qmk/master' into vial

2021-06-26 16:11:57 -04:00
parent 9b22dd664e cbe761ea16
commit a89c941828
4671 changed files with 157521 additions and 33976 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