f8596b40a4bb15a1881138baa8b8787277e2e622
- Author
- Ryan <fauxpark@gmail.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Normalise mouse keycodes (#23975)
Diff
This diff is truncated to protect this page.
1diff --git a/data/constants/keycodes/keycodes_0.0.5.hjson b/data/constants/keycodes/keycodes_0.0.5.hjson
2new file mode 100644
3index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
4--- /dev/null
5+++ b/data/constants/keycodes/keycodes_0.0.5.hjson
6diff --git a/data/constants/keycodes/keycodes_0.0.5_basic.hjson b/data/constants/keycodes/keycodes_0.0.5_basic.hjson
7new file mode 100644
8index 0000000000000000000000000000000000000000..79b6bf6596efb34b132b12f49084cefb8dab752e
9--- /dev/null
10+++ b/data/constants/keycodes/keycodes_0.0.5_basic.hjson
11@@ -0,0 +1,175 @@
12+{
13+ "keycodes": {
14+ "0x00CD": {
15+ "group": "mouse",
16+ "key": "QK_MOUSE_CURSOR_UP",
17+ "label": "Mouse cursor up",
18+ "aliases": [
19+ "!reset!",
20+ "MS_UP"
21+ ]
22+ },
23+ "0x00CE": {
24+ "group": "mouse",
25+ "key": "QK_MOUSE_CURSOR_DOWN",
26+ "label": "Mouse cursor down",
27+ "aliases": [
28+ "!reset!",
29+ "MS_DOWN"
30+ ]
31+ },
32+ "0x00CF": {
33+ "group": "mouse",
34+ "key": "QK_MOUSE_CURSOR_LEFT",
35+ "label": "Mouse cursor left",
36+ "aliases": [
37+ "!reset!",
38+ "MS_LEFT"
39+ ]
40+ },
41+ "0x00D0": {
42+ "group": "mouse",
43+ "key": "QK_MOUSE_CURSOR_RIGHT",
44+ "label": "Mouse cursor right",
45+ "aliases": [
46+ "!reset!",
47+ "MS_RGHT"
48+ ]
49+ },
50+ "0x00D1": {
51+ "group": "mouse",
52+ "key": "QK_MOUSE_BUTTON_1",
53+ "label": "Mouse button 1",
54+ "aliases": [
55+ "!reset!",
56+ "MS_BTN1"
57+ ]
58+ },
59+ "0x00D2": {
60+ "group": "mouse",
61+ "key": "QK_MOUSE_BUTTON_2",
62+ "label": "Mouse button 2",
63+ "aliases": [
64+ "!reset!",
65+ "MS_BTN2"
66+ ]
67+ },
68+ "0x00D3": {
69+ "group": "mouse",
70+ "key": "QK_MOUSE_BUTTON_3",
71+ "label": "Mouse button 3",
72+ "aliases": [
73+ "!reset!",
74+ "MS_BTN3"
75+ ]
76+ },
77+ "0x00D4": {
78+ "group": "mouse",
79+ "key": "QK_MOUSE_BUTTON_4",
80+ "label": "Mouse button 4",
81+ "aliases": [
82+ "!reset!",
83+ "MS_BTN4"
84+ ]
85+ },
86+ "0x00D5": {
87+ "group": "mouse",
88+ "key": "QK_MOUSE_BUTTON_5",
89+ "label": "Mouse button 5",
90+ "aliases": [
91+ "!reset!",
92+ "MS_BTN5"
93+ ]
94+ },
95+ "0x00D6": {
96+ "group": "mouse",
97+ "key": "QK_MOUSE_BUTTON_6",
98+ "label": "Mouse button 6",
99+ "aliases": [
100+ "!reset!",
101+ "MS_BTN6"
102+ ]
103+ },
104+ "0x00D7": {
105+ "group": "mouse",
106+ "key": "QK_MOUSE_BUTTON_7",
107+ "label": "Mouse button 7",
108+ "aliases": [
109+ "!reset!",
110+ "MS_BTN7"
111diff --git a/docs/features/encoders.md b/docs/features/encoders.md
112index eea70dafecfd501e29ecf195afb59ca82ad51da5..73cbb4f3f3f748bc01329377ee25bd67796bb730 100644
113--- a/docs/features/encoders.md
114+++ b/docs/features/encoders.md
115@@ -84,10 +84,10 @@ Your `keymap.c` will then need an encoder mapping defined (for four layers and t
116 ```c
117 #if defined(ENCODER_MAP_ENABLE)
118 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
119- [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
120- [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
121- [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
122- [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
123+ [0] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
124+ [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
125+ [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
126+ [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
127 };
128 #endif
129 ```
130diff --git a/docs/features/mouse_keys.md b/docs/features/mouse_keys.md
131index c2b3e98f4241231e15001fef325aa98c516b8e6c..4cc06c992aed9fe10488f4f27e7a9f7b019cee35 100644
132--- a/docs/features/mouse_keys.md
133+++ b/docs/features/mouse_keys.md
134@@ -18,27 +18,27 @@ MOUSEKEY_ENABLE = yes
135
136 In your keymap you can use the following keycodes to map key presses to mouse actions:
137
138-|Key |Aliases |Description |
139-|----------------|---------|-----------------|
140-|`KC_MS_UP` |`KC_MS_U`|Move cursor up |
141-|`KC_MS_DOWN` |`KC_MS_D`|Move cursor down |
142-|`KC_MS_LEFT` |`KC_MS_L`|Move cursor left |
143-|`KC_MS_RIGHT` |`KC_MS_R`|Move cursor right|
144-|`KC_MS_BTN1` |`KC_BTN1`|Press button 1 |
145-|`KC_MS_BTN2` |`KC_BTN2`|Press button 2 |
146-|`KC_MS_BTN3` |`KC_BTN3`|Press button 3 |
147-|`KC_MS_BTN4` |`KC_BTN4`|Press button 4 |
148-|`KC_MS_BTN5` |`KC_BTN5`|Press button 5 |
149-|`KC_MS_BTN6` |`KC_BTN6`|Press button 6 |
150-|`KC_MS_BTN7` |`KC_BTN7`|Press button 7 |
151-|`KC_MS_BTN8` |`KC_BTN8`|Press button 8 |
152-|`KC_MS_WH_UP` |`KC_WH_U`|Move wheel up |
153-|`KC_MS_WH_DOWN` |`KC_WH_D`|Move wheel down |
154-|`KC_MS_WH_LEFT` |`KC_WH_L`|Move wheel left |
155-|`KC_MS_WH_RIGHT`|`KC_WH_R`|Move wheel right |
156-|`KC_MS_ACCEL0` |`KC_ACL0`|Set speed to 0 |
157-|`KC_MS_ACCEL1` |`KC_ACL1`|Set speed to 1 |
158-|`KC_MS_ACCEL2` |`KC_ACL2`|Set speed to 2 |
159+|Key |Aliases |Description |
160+|-------------------------|---------|---------------------------|
161+|`QK_MOUSE_CURSOR_UP` |`MS_UP` |Mouse cursor up |
162+|`QK_MOUSE_CURSOR_DOWN` |`MS_DOWN`|Mouse cursor down |
163+|`QK_MOUSE_CURSOR_LEFT` |`MS_LEFT`|Mouse cursor left |
164+|`QK_MOUSE_CURSOR_RIGHT` |`MS_RGHT`|Mouse cursor right |
165+|`QK_MOUSE_BUTTON_1` |`MS_BTN1`|Mouse button 1 |
166+|`QK_MOUSE_BUTTON_2` |`MS_BTN2`|Mouse button 2 |
167+|`QK_MOUSE_BUTTON_3` |`MS_BTN3`|Mouse button 3 |
168+|`QK_MOUSE_BUTTON_4` |`MS_BTN4`|Mouse button 4 |
169+|`QK_MOUSE_BUTTON_5` |`MS_BTN5`|Mouse button 5 |
170+|`QK_MOUSE_BUTTON_6` |`MS_BTN6`|Mouse button 6 |
171+|`QK_MOUSE_BUTTON_7` |`MS_BTN7`|Mouse button 7 |
172+|`QK_MOUSE_BUTTON_8` |`MS_BTN8`|Mouse button 8 |
173+|`QK_MOUSE_WHEEL_UP` |`MS_WHLU`|Mouse wheel up |
174+|`QK_MOUSE_WHEEL_DOWN` |`MS_WHLD`|Mouse wheel down |
175+|`QK_MOUSE_WHEEL_LEFT` |`MS_WHLL`|Mouse wheel left |
176+|`QK_MOUSE_WHEEL_RIGHT` |`MS_WHLR`|Mouse wheel right |
177+|`QK_MOUSE_ACCELERATION_0`|`MS_ACL0`|Set mouse acceleration to 0|
178+|`QK_MOUSE_ACCELERATION_1`|`MS_ACL1`|Set mouse acceleration to 1|
179+|`QK_MOUSE_ACCELERATION_2`|`MS_ACL2`|Set mouse acceleration to 2|
180
181 ## Configuring mouse keys
182
183@@ -106,17 +106,17 @@ Tips:
184
185 ### Constant mode
186
187-In this mode you can define multiple different speeds for both the cursor and the mouse wheel. There is no acceleration. `KC_ACL0`, `KC_ACL1` and `KC_ACL2` change the cursor and scroll speed to their respective setting.
188+In this mode you can define multiple different speeds for both the cursor and the mouse wheel. There is no acceleration. `MS_ACL0`, `MS_ACL1` and `MS_ACL2` change the cursor and scroll speed to their respective setting.
189
190 You can choose whether speed selection is momentary or tap-to-select:
191
192 * **Momentary:** The chosen speed is only active while you hold the respective key. When the key is raised, mouse keys returns to the unmodified speed.
193-* **Tap-to-select:** The chosen speed is activated when you press the respective key and remains active even after the key has been raised. The default speed is that of `KC_ACL1`. There is no unmodified speed.
194+* **Tap-to-select:** The chosen speed is activated when you press the respective key and remains active even after the key has been raised. The default speed is that of `MS_ACL1`. There is no unmodified speed.
195
196 The default speeds from slowest to fastest are as follows:
197
198-* **Momentary:** `KC_ACL0` < `KC_ACL1` < *unmodified* < `KC_ACL2`
199-* **Tap-to-select:** `KC_ACL0` < `KC_ACL1` < `KC_ACL2`
200+* **Momentary:** `MS_ACL0` < `MS_ACL1` < *unmodified* < `MS_ACL2`
201+* **Tap-to-select:** `MS_ACL0` < `MS_ACL1` < `MS_ACL2`
202
203 To use constant speed mode, you must at least define `MK_3_SPEED` in your keymap’s `config.h` file:
204
205@@ -138,32 +138,32 @@ Use the following settings if you want to adjust cursor movement or scrolling:
206 |`MK_MOMENTARY_ACCEL` |*Not defined*|Enable momentary speed selection |
207 |`MK_C_OFFSET_UNMOD` |16 |Cursor offset per movement (unmodified) |
208 |`MK_C_INTERVAL_UNMOD`|16 |Time between cursor movements (unmodified) |
209-|`MK_C_OFFSET_0` |1 |Cursor offset per movement (`KC_ACL0`) |
210-|`MK_C_INTERVAL_0` |32 |Time between cursor movements (`KC_ACL0`) |
211-|`MK_C_OFFSET_1` |4 |Cursor offset per movement (`KC_ACL1`) |
212-|`MK_C_INTERVAL_1` |16 |Time between cursor movements (`KC_ACL1`) |
213-|`MK_C_OFFSET_2` |32 |Cursor offset per movement (`KC_ACL2`) |
214-|`MK_C_INTERVAL_2` |16 |Time between cursor movements (`KC_ACL2`) |
215+|`MK_C_OFFSET_0` |1 |Cursor offset per movement (`MS_ACL0`) |
216+|`MK_C_INTERVAL_0` |32 |Time between cursor movements (`MS_ACL0`) |
217+|`MK_C_OFFSET_1` |4 |Cursor offset per movement (`MS_ACL1`) |
218+|`MK_C_INTERVAL_1` |16 |Time between cursor movements (`MS_ACL1`) |
219+|`MK_C_OFFSET_2` |32 |Cursor offset per movement (`MS_ACL2`) |
220+|`MK_C_INTERVAL_2` |16 |Time between cursor movements (`MS_ACL2`) |
221 |`MK_W_OFFSET_UNMOD` |1 |Scroll steps per scroll action (unmodified)|
222 |`MK_W_INTERVAL_UNMOD`|40 |Time between scroll steps (unmodified) |
223-|`MK_W_OFFSET_0` |1 |Scroll steps per scroll action (`KC_ACL0`) |
224-|`MK_W_INTERVAL_0` |360 |Time between scroll steps (`KC_ACL0`) |
225-|`MK_W_OFFSET_1` |1 |Scroll steps per scroll action (`KC_ACL1`) |
226-|`MK_W_INTERVAL_1` |120 |Time between scroll steps (`KC_ACL1`) |
227-|`MK_W_OFFSET_2` |1 |Scroll steps per scroll action (`KC_ACL2`) |
228-|`MK_W_INTERVAL_2` |20 |Time between scroll steps (`KC_ACL2`) |
229+|`MK_W_OFFSET_0` |1 |Scroll steps per scroll action (`MS_ACL0`) |
230+|`MK_W_INTERVAL_0` |360 |Time between scroll steps (`MS_ACL0`) |
231+|`MK_W_OFFSET_1` |1 |Scroll steps per scroll action (`MS_ACL1`) |
232+|`MK_W_INTERVAL_1` |120 |Time between scroll steps (`MS_ACL1`) |
233+|`MK_W_OFFSET_2` |1 |Scroll steps per scroll action (`MS_ACL2`) |
234diff --git a/docs/features/repeat_key.md b/docs/features/repeat_key.md
235index 53495e0f4d6cb88167df6d3d9cd86ed1fda1698c..7f2bdc44e65507cfeb72423207ca119c79fa40cb 100644
236--- a/docs/features/repeat_key.md
237+++ b/docs/features/repeat_key.md
238@@ -60,10 +60,10 @@ with mods, like Ctrl + Left ↔ Ctrl + Right Arrow.
239 |`KC_UP` ↔ `KC_DOWN` | Up ↔ Down Arrow |
240 |`KC_HOME` ↔ `KC_END` | Home ↔ End |
241 |`KC_PGUP` ↔ `KC_PGDN` | Page Up ↔ Page Down |
242-|`KC_MS_L` ↔ `KC_MS_R` | Mouse Cursor Left ↔ Right |
243-|`KC_MS_U` ↔ `KC_MS_D` | Mouse Cursor Up ↔ Down |
244-|`KC_WH_L` ↔ `KC_WH_R` | Mouse Wheel Left ↔ Right |
245-|`KC_WH_U` ↔ `KC_WH_D` | Mouse Wheel Up ↔ Down |
246+|`MS_LEFT` ↔ `MS_RGHT` | Mouse Cursor Left ↔ Right |
247+|`MS_UP` ↔ `MS_DOWN` | Mouse Cursor Up ↔ Down |
248+|`MS_WHLL` ↔ `MS_WHLR` | Mouse Wheel Left ↔ Right |
249+|`MS_WHLU` ↔ `MS_WHLD` | Mouse Wheel Up ↔ Down |
250
251 **Misc**
252
253diff --git a/docs/keycodes.md b/docs/keycodes.md
254index 4c91d98fa7a4ea165dc52f2848324b6f926df0b4..ea8b2e7b650780e9aa9386748c4fa0b789e19bb4 100644
255--- a/docs/keycodes.md
256+++ b/docs/keycodes.md
257@@ -611,24 +611,27 @@ See also: [MIDI](features/midi)
258
259 See also: [Mouse Keys](features/mouse_keys)
260
261-|Key |Aliases |Description |
262-|----------------|---------|---------------------------|
263-|`KC_MS_UP` |`KC_MS_U`|Mouse Cursor Up |
264-|`KC_MS_DOWN` |`KC_MS_D`|Mouse Cursor Down |
265-|`KC_MS_LEFT` |`KC_MS_L`|Mouse Cursor Left |
266-|`KC_MS_RIGHT` |`KC_MS_R`|Mouse Cursor Right |
267-|`KC_MS_BTN1` |`KC_BTN1`|Mouse Button 1 |
268-|`KC_MS_BTN2` |`KC_BTN2`|Mouse Button 2 |
269-|`KC_MS_BTN3` |`KC_BTN3`|Mouse Button 3 |
270-|`KC_MS_BTN4` |`KC_BTN4`|Mouse Button 4 |
271-|`KC_MS_BTN5` |`KC_BTN5`|Mouse Button 5 |
272-|`KC_MS_WH_UP` |`KC_WH_U`|Mouse Wheel Up |
273-|`KC_MS_WH_DOWN` |`KC_WH_D`|Mouse Wheel Down |
274-|`KC_MS_WH_LEFT` |`KC_WH_L`|Mouse Wheel Left |
275-|`KC_MS_WH_RIGHT`|`KC_WH_R`|Mouse Wheel Right |
276-|`KC_MS_ACCEL0` |`KC_ACL0`|Set mouse acceleration to 0|
277-|`KC_MS_ACCEL1` |`KC_ACL1`|Set mouse acceleration to 1|
278-|`KC_MS_ACCEL2` |`KC_ACL2`|Set mouse acceleration to 2|
279+|Key |Aliases |Description |
280+|-------------------------|---------|---------------------------|
281+|`QK_MOUSE_CURSOR_UP` |`MS_UP` |Mouse cursor up |
282+|`QK_MOUSE_CURSOR_DOWN` |`MS_DOWN`|Mouse cursor down |
283+|`QK_MOUSE_CURSOR_LEFT` |`MS_LEFT`|Mouse cursor left |
284+|`QK_MOUSE_CURSOR_RIGHT` |`MS_RGHT`|Mouse cursor right |
285+|`QK_MOUSE_BUTTON_1` |`MS_BTN1`|Mouse button 1 |
286+|`QK_MOUSE_BUTTON_2` |`MS_BTN2`|Mouse button 2 |
287+|`QK_MOUSE_BUTTON_3` |`MS_BTN3`|Mouse button 3 |
288+|`QK_MOUSE_BUTTON_4` |`MS_BTN4`|Mouse button 4 |
289+|`QK_MOUSE_BUTTON_5` |`MS_BTN5`|Mouse button 5 |
290+|`QK_MOUSE_BUTTON_6` |`MS_BTN6`|Mouse button 6 |
291+|`QK_MOUSE_BUTTON_7` |`MS_BTN7`|Mouse button 7 |
292+|`QK_MOUSE_BUTTON_8` |`MS_BTN8`|Mouse button 8 |
293+|`QK_MOUSE_WHEEL_UP` |`MS_WHLU`|Mouse wheel up |
294+|`QK_MOUSE_WHEEL_DOWN` |`MS_WHLD`|Mouse wheel down |
295+|`QK_MOUSE_WHEEL_LEFT` |`MS_WHLL`|Mouse wheel left |
296+|`QK_MOUSE_WHEEL_RIGHT` |`MS_WHLR`|Mouse wheel right |
297+|`QK_MOUSE_ACCELERATION_0`|`MS_ACL0`|Set mouse acceleration to 0|
298+|`QK_MOUSE_ACCELERATION_1`|`MS_ACL1`|Set mouse acceleration to 1|
299+|`QK_MOUSE_ACCELERATION_2`|`MS_ACL2`|Set mouse acceleration to 2|
300
301 ## Modifiers {#modifiers}
302
303diff --git a/drivers/sensors/cirque_pinnacle_gestures.h b/drivers/sensors/cirque_pinnacle_gestures.h
304index d2aa206b2be69996171d693cffc3907a285f7b8e..1412c86f7ebd4bb1b695302f51a5ec50926ab6ff 100644
305--- a/drivers/sensors/cirque_pinnacle_gestures.h
306+++ b/drivers/sensors/cirque_pinnacle_gestures.h
307@@ -28,7 +28,7 @@ typedef struct {
308 # ifndef CIRQUE_PINNACLE_TAPPING_TERM
309 # include "action.h"
310 # include "action_tapping.h"
311-# define CIRQUE_PINNACLE_TAPPING_TERM GET_TAPPING_TERM(KC_BTN1, &(keyrecord_t){})
312+# define CIRQUE_PINNACLE_TAPPING_TERM GET_TAPPING_TERM(QK_MOUSE_BUTTON_1, &(keyrecord_t){})
313 # endif
314 # ifndef CIRQUE_PINNACLE_TOUCH_DEBOUNCE
315 # define CIRQUE_PINNACLE_TOUCH_DEBOUNCE (CIRQUE_PINNACLE_TAPPING_TERM * 8)
316diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
317index aab005ebd87f3549fbb645bad0d0960da0bdcbe2..7e0b82e9e7a9485173a1db169059f89cd37ac0c8 100644
318--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
319+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
320@@ -101,7 +101,7 @@ uint16_t handle_encoder_clockwise(void){
321 mapped_code = KC_MEDIA_NEXT_TRACK;
322 break;
323 case ENC_MODE_SCROLL:
324- mapped_code = KC_WH_D;
325+ mapped_code = QK_MOUSE_WHEEL_DOWN;
326 break;
327 #ifdef BACKLIGHT_ENABLE
328 case ENC_MODE_BACKLIGHT:
329@@ -143,7 +143,7 @@ uint16_t handle_encoder_ccw(void){
330 mapped_code = KC_MEDIA_PREV_TRACK;
331 break;
332 case ENC_MODE_SCROLL:
333- mapped_code = KC_WH_U;
334+ mapped_code = QK_MOUSE_WHEEL_UP;
335 break;
336 #ifdef BACKLIGHT_ENABLE
337 case ENC_MODE_BACKLIGHT:
338@@ -186,7 +186,7 @@ uint16_t handle_encoder_press(void){
339 mapped_code = KC_MEDIA_PLAY_PAUSE;
340 break;
341 case ENC_MODE_SCROLL:
342- mapped_code = KC_BTN3;
343+ mapped_code = QK_MOUSE_BUTTON_3;
344 break;
345 #ifdef BACKLIGHT_ENABLE
346 case ENC_MODE_BACKLIGHT:
347diff --git a/keyboards/dichotomy/keymaps/default/keymap.c b/keyboards/dichotomy/keymaps/default/keymap.c
348index b83f7b82e9ea36421429703136607e2febbfe571..b92beb73ccc7079ee4a61d3d2e516a754339175b 100755
349--- a/keyboards/dichotomy/keymaps/default/keymap.c
350+++ b/keyboards/dichotomy/keymaps/default/keymap.c
351@@ -28,9 +28,9 @@ enum dichotomy_keycodes
352 NUMKEY,
353 SFTKEY,
354 MOUKEY,
355- MS_BTN1,
356- MS_BTN2,
357- MS_BTN3
358+ CK_MSE1,
359+ CK_MSE2,
360+ CK_MSE3
361 };
362
363 #define CUSTOM_LONGPRESS 150
364@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
365 NUMKEY, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, CK_QE,
366 SFTKEY, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MOUKEY,
367 KC_LCTL, KC_LALT, KC_LGUI, KC_RGUI, KC_RALT, KC_RCTL,
368- MS_BTN3, KC_LBRC, KC_LPRN, KC_SPC, KC_SPC, KC_RPRN, KC_RBRC, MS_BTN3
369+ CK_MSE3, KC_LBRC, KC_LPRN, KC_SPC, KC_SPC, KC_RPRN, KC_RBRC, CK_MSE3
370 ),
371
372 [_SF] = LAYOUT( /* Shifted layout, small changes (because angle brackets have been moved to thumb cluster buttons) */
373@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
374
375 [_MS] = LAYOUT( /* Mouse layer, including buttons for clicking. */
376 _______, _______, _______, _______, _______, _______, KC_VOLU, KC_HOME, KC_PGUP, _______, _______, _______,
377- _______, _______, _______, _______, _______, _______, _______, MS_BTN1, MS_BTN2, _______, _______, _______,
378+ _______, _______, _______, _______, _______, _______, _______, CK_MSE1, CK_MSE2, _______, _______, _______,
379 _______, _______, _______, _______, _______, _______, KC_VOLD, KC_END, KC_PGDN, _______, _______, _______,
380 _______, _______, _______, _______, KC_UP, _______,
381 _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______
382@@ -311,7 +311,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
383 break;
384
385 //mouse buttons, for 1-3, to update the mouse report:
386- case MS_BTN1:
387+ case CK_MSE1:
388 currentReport = pointing_device_get_report();
389 if (record->event.pressed) {
390 if (shift_held && shift_suspended){
391@@ -327,7 +327,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
392 pointing_device_set_report(currentReport);
393 returnVal = false;
394 break;
395- case MS_BTN2:
396+ case CK_MSE2:
397 currentReport = pointing_device_get_report();
398 if (record->event.pressed) {
399 if (shift_held && shift_suspended){
400@@ -343,7 +343,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
401 pointing_device_set_report(currentReport);
402 returnVal = false;
403 break;
404- case MS_BTN3:
405+ case CK_MSE3:
406 currentReport = pointing_device_get_report();
407 if (record->event.pressed) {
408 if (shift_held && shift_suspended){
409diff --git a/quantum/action.c b/quantum/action.c
410index 74ef55e5eb2ee906fe8beea94d36ce5c7a5a7a51..a39631ba3e9b5409a6e5035b8b090361241cb704 100644
411--- a/quantum/action.c
412+++ b/quantum/action.c
413@@ -329,7 +329,7 @@ void register_mouse(uint8_t mouse_keycode, bool pressed) {
414 // should mousekeys send report, or does something else handle this?
415 switch (mouse_keycode) {
416 # if defined(PS2_MOUSE_ENABLE) || defined(POINTING_DEVICE_ENABLE)
417- case KC_MS_BTN1 ... KC_MS_BTN8:
418+ case QK_MOUSE_BUTTON_1 ... QK_MOUSE_BUTTON_8:
419 // let pointing device handle the buttons
420 // expand if/when it handles more of the code
421 # if defined(POINTING_DEVICE_ENABLE)
422@@ -351,8 +351,8 @@ void register_mouse(uint8_t mouse_keycode, bool pressed) {
423
424 #ifdef PS2_MOUSE_ENABLE
425 // make sure that ps2 mouse has button report synced
426- if (KC_MS_BTN1 <= mouse_keycode && mouse_keycode <= KC_MS_BTN3) {
427- uint8_t tmp_button_msk = MOUSE_BTN_MASK(mouse_keycode - KC_MS_BTN1);
428+ if (QK_MOUSE_BUTTON_1 <= mouse_keycode && mouse_keycode <= QK_MOUSE_BUTTON_3) {
429+ uint8_t tmp_button_msk = MOUSE_BTN_MASK(mouse_keycode - QK_MOUSE_BUTTON_1);
430 tp_buttons = pressed ? tp_buttons | tmp_button_msk : tp_buttons & ~tmp_button_msk;
431 }
432 #endif
433diff --git a/quantum/encoder.c b/quantum/encoder.c
434index 2ddbf3ee1e02d4748402e1f7574ee5f0148dd15b..27d7b1fc8091c4a1bbaf00d65f5b041daad96f3d 100644
435--- a/quantum/encoder.c
436+++ b/quantum/encoder.c
437@@ -160,7 +160,7 @@ __attribute__((weak)) bool encoder_update_kb(uint8_t index, bool clockwise) {
438 # if defined(EXTRAKEY_ENABLE)
439 tap_code_delay(KC_VOLU, 10);
440 # elif defined(MOUSEKEY_ENABLE)
441- tap_code_delay(KC_MS_WH_UP, 10);
442+ tap_code_delay(QK_MOUSE_WHEEL_UP, 10);
443 # else
444 tap_code_delay(KC_PGDN, 10);
445 # endif
446@@ -168,7 +168,7 @@ __attribute__((weak)) bool encoder_update_kb(uint8_t index, bool clockwise) {
447 # if defined(EXTRAKEY_ENABLE)
448 tap_code_delay(KC_VOLD, 10);
449 # elif defined(MOUSEKEY_ENABLE)
450- tap_code_delay(KC_MS_WH_DOWN, 10);
451+ tap_code_delay(QK_MOUSE_WHEEL_DOWN, 10);
452 # else
453 tap_code_delay(KC_PGUP, 10);
454 # endif
455diff --git a/quantum/keycode.h b/quantum/keycode.h
456index df1452d2965cf828be49582339245cf60ab45155..4ff6894a0117a2c07007bed58e20985e9d101297 100644
457--- a/quantum/keycode.h
458+++ b/quantum/keycode.h
459@@ -29,10 +29,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
460 #define IS_ANY(code) (KC_A <= (code) && (code) <= 0xFF)
461
462 #define IS_MOUSEKEY(code) IS_MOUSE_KEYCODE(code)
463-#define IS_MOUSEKEY_MOVE(code) (KC_MS_UP <= (code) && (code) <= KC_MS_RIGHT)
464-#define IS_MOUSEKEY_BUTTON(code) (KC_MS_BTN1 <= (code) && (code) <= KC_MS_BTN8)
465-#define IS_MOUSEKEY_WHEEL(code) (KC_MS_WH_UP <= (code) && (code) <= KC_MS_WH_RIGHT)
466-#define IS_MOUSEKEY_ACCEL(code) (KC_MS_ACCEL0 <= (code) && (code) <= KC_MS_ACCEL2)
467+#define IS_MOUSEKEY_MOVE(code) (QK_MOUSE_CURSOR_UP <= (code) && (code) <= QK_MOUSE_CURSOR_RIGHT)
468+#define IS_MOUSEKEY_BUTTON(code) (QK_MOUSE_BUTTON_1 <= (code) && (code) <= QK_MOUSE_BUTTON_8)
469+#define IS_MOUSEKEY_WHEEL(code) (QK_MOUSE_WHEEL_UP <= (code) && (code) <= QK_MOUSE_WHEEL_RIGHT)
470+#define IS_MOUSEKEY_ACCEL(code) (QK_MOUSE_ACCELERATION_0 <= (code) && (code) <= QK_MOUSE_ACCELERATION_2)
471
472 #define MOD_BIT(code) (1 << ((code)&0x07))
473
474diff --git a/quantum/keycodes.h b/quantum/keycodes.h
475index c92028ab4399f0c2b5d829ff8cd58b0643bd20ad..f461e4a586e22caebfecd28143e12ce7c1d60e21 100644
476--- a/quantum/keycodes.h
477+++ b/quantum/keycodes.h
478@@ -283,25 +283,25 @@ enum qk_keycode_defines {
479 KC_ASSISTANT = 0x00C0,
480 KC_MISSION_CONTROL = 0x00C1,
481 KC_LAUNCHPAD = 0x00C2,
482- KC_MS_UP = 0x00CD,
483- KC_MS_DOWN = 0x00CE,
484- KC_MS_LEFT = 0x00CF,
485- KC_MS_RIGHT = 0x00D0,
486- KC_MS_BTN1 = 0x00D1,
487- KC_MS_BTN2 = 0x00D2,
488- KC_MS_BTN3 = 0x00D3,
489- KC_MS_BTN4 = 0x00D4,
490- KC_MS_BTN5 = 0x00D5,
491- KC_MS_BTN6 = 0x00D6,
492- KC_MS_BTN7 = 0x00D7,
493- KC_MS_BTN8 = 0x00D8,
494- KC_MS_WH_UP = 0x00D9,
495- KC_MS_WH_DOWN = 0x00DA,
496- KC_MS_WH_LEFT = 0x00DB,
497- KC_MS_WH_RIGHT = 0x00DC,
498- KC_MS_ACCEL0 = 0x00DD,
499- KC_MS_ACCEL1 = 0x00DE,
500- KC_MS_ACCEL2 = 0x00DF,
501+ QK_MOUSE_CURSOR_UP = 0x00CD,
502+ QK_MOUSE_CURSOR_DOWN = 0x00CE,
503+ QK_MOUSE_CURSOR_LEFT = 0x00CF,
504+ QK_MOUSE_CURSOR_RIGHT = 0x00D0,
505+ QK_MOUSE_BUTTON_1 = 0x00D1,
506+ QK_MOUSE_BUTTON_2 = 0x00D2,
507+ QK_MOUSE_BUTTON_3 = 0x00D3,
508+ QK_MOUSE_BUTTON_4 = 0x00D4,
509+ QK_MOUSE_BUTTON_5 = 0x00D5,
510+ QK_MOUSE_BUTTON_6 = 0x00D6,
511+ QK_MOUSE_BUTTON_7 = 0x00D7,
512+ QK_MOUSE_BUTTON_8 = 0x00D8,
513+ QK_MOUSE_WHEEL_UP = 0x00D9,
514+ QK_MOUSE_WHEEL_DOWN = 0x00DA,
515+ QK_MOUSE_WHEEL_LEFT = 0x00DB,
516+ QK_MOUSE_WHEEL_RIGHT = 0x00DC,
517+ QK_MOUSE_ACCELERATION_0 = 0x00DD,
518+ QK_MOUSE_ACCELERATION_1 = 0x00DE,
519+ QK_MOUSE_ACCELERATION_2 = 0x00DF,
520 KC_LEFT_CTRL = 0x00E0,
521 KC_LEFT_SHIFT = 0x00E1,
522 KC_LEFT_ALT = 0x00E2,
523@@ -926,25 +926,25 @@ enum qk_keycode_defines {
524 KC_ASST = KC_ASSISTANT,
525 KC_MCTL = KC_MISSION_CONTROL,
526 KC_LPAD = KC_LAUNCHPAD,
527- KC_MS_U = KC_MS_UP,
528- KC_MS_D = KC_MS_DOWN,
529- KC_MS_L = KC_MS_LEFT,
530- KC_MS_R = KC_MS_RIGHT,
531- KC_BTN1 = KC_MS_BTN1,
532- KC_BTN2 = KC_MS_BTN2,
533- KC_BTN3 = KC_MS_BTN3,
534- KC_BTN4 = KC_MS_BTN4,
535- KC_BTN5 = KC_MS_BTN5,
536- KC_BTN6 = KC_MS_BTN6,
537- KC_BTN7 = KC_MS_BTN7,
538- KC_BTN8 = KC_MS_BTN8,
539- KC_WH_U = KC_MS_WH_UP,
540- KC_WH_D = KC_MS_WH_DOWN,
541- KC_WH_L = KC_MS_WH_LEFT,
542- KC_WH_R = KC_MS_WH_RIGHT,
543- KC_ACL0 = KC_MS_ACCEL0,
544- KC_ACL1 = KC_MS_ACCEL1,
545- KC_ACL2 = KC_MS_ACCEL2,
546+ MS_UP = QK_MOUSE_CURSOR_UP,
547+ MS_DOWN = QK_MOUSE_CURSOR_DOWN,
548+ MS_LEFT = QK_MOUSE_CURSOR_LEFT,
549+ MS_RGHT = QK_MOUSE_CURSOR_RIGHT,
550+ MS_BTN1 = QK_MOUSE_BUTTON_1,
551+ MS_BTN2 = QK_MOUSE_BUTTON_2,
552+ MS_BTN3 = QK_MOUSE_BUTTON_3,
553+ MS_BTN4 = QK_MOUSE_BUTTON_4,
554+ MS_BTN5 = QK_MOUSE_BUTTON_5,
555+ MS_BTN6 = QK_MOUSE_BUTTON_6,
556+ MS_BTN7 = QK_MOUSE_BUTTON_7,
557+ MS_BTN8 = QK_MOUSE_BUTTON_8,
558+ MS_WHLU = QK_MOUSE_WHEEL_UP,
559+ MS_WHLD = QK_MOUSE_WHEEL_DOWN,
560+ MS_WHLL = QK_MOUSE_WHEEL_LEFT,
561+ MS_WHLR = QK_MOUSE_WHEEL_RIGHT,
562+ MS_ACL0 = QK_MOUSE_ACCELERATION_0,
563+ MS_ACL1 = QK_MOUSE_ACCELERATION_1,
564+ MS_ACL2 = QK_MOUSE_ACCELERATION_2,
565 KC_LCTL = KC_LEFT_CTRL,
566 KC_LSFT = KC_LEFT_SHIFT,
567 KC_LALT = KC_LEFT_ALT,
568@@ -1457,7 +1457,7 @@ enum qk_keycode_defines {
569 #define IS_BASIC_KEYCODE(code) ((code) >= KC_A && (code) <= KC_EXSEL)
570 #define IS_SYSTEM_KEYCODE(code) ((code) >= KC_SYSTEM_POWER && (code) <= KC_SYSTEM_WAKE)
571 #define IS_CONSUMER_KEYCODE(code) ((code) >= KC_AUDIO_MUTE && (code) <= KC_LAUNCHPAD)
572-#define IS_MOUSE_KEYCODE(code) ((code) >= KC_MS_UP && (code) <= KC_MS_ACCEL2)
573+#define IS_MOUSE_KEYCODE(code) ((code) >= QK_MOUSE_CURSOR_UP && (code) <= QK_MOUSE_ACCELERATION_2)
574 #define IS_MODIFIER_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI)
575 #define IS_SWAP_HANDS_KEYCODE(code) ((code) >= QK_SWAP_HANDS_TOGGLE && (code) <= QK_SWAP_HANDS_ONE_SHOT)
576 #define IS_MAGIC_KEYCODE(code) ((code) >= QK_MAGIC_SWAP_CONTROL_CAPS_LOCK && (code) <= QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK)
577@@ -1482,7 +1482,7 @@ enum qk_keycode_defines {
578diff --git a/quantum/mousekey.c b/quantum/mousekey.c
579index 39108117524b42b0f1a2f2db249907074c248dae..8683cfdffacb336d453aadf3b0cab85ef16b030d 100644
580--- a/quantum/mousekey.c
581+++ b/quantum/mousekey.c
582@@ -407,42 +407,42 @@ void mousekey_on(uint8_t code) {
583 # ifdef MOUSEKEY_INERTIA
584
585 // initial keypress sets impulse and activates first frame of movement
586- if ((code == KC_MS_UP) || (code == KC_MS_DOWN)) {
587- mousekey_y_dir = (code == KC_MS_DOWN) ? 1 : -1;
588+ if ((code == QK_MOUSE_CURSOR_UP) || (code == QK_MOUSE_CURSOR_DOWN)) {
589+ mousekey_y_dir = (code == QK_MOUSE_CURSOR_DOWN) ? 1 : -1;
590 if (mousekey_frame < 2) mouse_report.y = move_unit(1);
591- } else if ((code == KC_MS_LEFT) || (code == KC_MS_RIGHT)) {
592- mousekey_x_dir = (code == KC_MS_RIGHT) ? 1 : -1;
593+ } else if ((code == QK_MOUSE_CURSOR_LEFT) || (code == QK_MOUSE_CURSOR_RIGHT)) {
594+ mousekey_x_dir = (code == QK_MOUSE_CURSOR_RIGHT) ? 1 : -1;
595 if (mousekey_frame < 2) mouse_report.x = move_unit(0);
596 }
597
598 # else // no inertia
599
600- if (code == KC_MS_UP)
601+ if (code == QK_MOUSE_CURSOR_UP)
602 mouse_report.y = move_unit() * -1;
603- else if (code == KC_MS_DOWN)
604+ else if (code == QK_MOUSE_CURSOR_DOWN)
605 mouse_report.y = move_unit();
606- else if (code == KC_MS_LEFT)
607+ else if (code == QK_MOUSE_CURSOR_LEFT)
608 mouse_report.x = move_unit() * -1;
609- else if (code == KC_MS_RIGHT)
610+ else if (code == QK_MOUSE_CURSOR_RIGHT)
611 mouse_report.x = move_unit();
612
613 # endif // inertia or not
614
615- else if (code == KC_MS_WH_UP)
616+ else if (code == QK_MOUSE_WHEEL_UP)
617 mouse_report.v = wheel_unit();
618- else if (code == KC_MS_WH_DOWN)
619+ else if (code == QK_MOUSE_WHEEL_DOWN)
620 mouse_report.v = wheel_unit() * -1;
621- else if (code == KC_MS_WH_LEFT)
622+ else if (code == QK_MOUSE_WHEEL_LEFT)
623 mouse_report.h = wheel_unit() * -1;
624- else if (code == KC_MS_WH_RIGHT)
625+ else if (code == QK_MOUSE_WHEEL_RIGHT)
626 mouse_report.h = wheel_unit();
627 else if (IS_MOUSEKEY_BUTTON(code))
628- mouse_report.buttons |= 1 << (code - KC_MS_BTN1);
629- else if (code == KC_MS_ACCEL0)
630+ mouse_report.buttons |= 1 << (code - QK_MOUSE_BUTTON_1);
631+ else if (code == QK_MOUSE_ACCELERATION_0)
632 mousekey_accel |= (1 << 0);
633- else if (code == KC_MS_ACCEL1)
634+ else if (code == QK_MOUSE_ACCELERATION_1)
635 mousekey_accel |= (1 << 1);
636- else if (code == KC_MS_ACCEL2)
637+ else if (code == QK_MOUSE_ACCELERATION_2)
638 mousekey_accel |= (1 << 2);
639 }
640
641@@ -450,43 +450,43 @@ void mousekey_off(uint8_t code) {
642 # ifdef MOUSEKEY_INERTIA
643
644 // key release clears impulse unless opposite direction is held
645- if ((code == KC_MS_UP) && (mousekey_y_dir < 1))
646+ if ((code == QK_MOUSE_CURSOR_UP) && (mousekey_y_dir < 1))
647 mousekey_y_dir = 0;
648- else if ((code == KC_MS_DOWN) && (mousekey_y_dir > -1))
649+ else if ((code == QK_MOUSE_CURSOR_DOWN) && (mousekey_y_dir > -1))
650 mousekey_y_dir = 0;
651- else if ((code == KC_MS_LEFT) && (mousekey_x_dir < 1))
652+ else if ((code == QK_MOUSE_CURSOR_LEFT) && (mousekey_x_dir < 1))
653 mousekey_x_dir = 0;
654- else if ((code == KC_MS_RIGHT) && (mousekey_x_dir > -1))
655+ else if ((code == QK_MOUSE_CURSOR_RIGHT) && (mousekey_x_dir > -1))
656 mousekey_x_dir = 0;
657
658 # else // no inertia
659
660- if (code == KC_MS_UP && mouse_report.y < 0)
661+ if (code == QK_MOUSE_CURSOR_UP && mouse_report.y < 0)
662 mouse_report.y = 0;
663- else if (code == KC_MS_DOWN && mouse_report.y > 0)
664+ else if (code == QK_MOUSE_CURSOR_DOWN && mouse_report.y > 0)
665 mouse_report.y = 0;
666- else if (code == KC_MS_LEFT && mouse_report.x < 0)
667+ else if (code == QK_MOUSE_CURSOR_LEFT && mouse_report.x < 0)
668 mouse_report.x = 0;
669- else if (code == KC_MS_RIGHT && mouse_report.x > 0)
670+ else if (code == QK_MOUSE_CURSOR_RIGHT && mouse_report.x > 0)
671 mouse_report.x = 0;
672
673 # endif // inertia or not
674
675- else if (code == KC_MS_WH_UP && mouse_report.v > 0)
676+ else if (code == QK_MOUSE_WHEEL_UP && mouse_report.v > 0)
677 mouse_report.v = 0;
678- else if (code == KC_MS_WH_DOWN && mouse_report.v < 0)
679+ else if (code == QK_MOUSE_WHEEL_DOWN && mouse_report.v < 0)
680 mouse_report.v = 0;
681- else if (code == KC_MS_WH_LEFT && mouse_report.h < 0)
682diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
683index 4682aceb14d91a3c7dd6ad0b741ff8382f12f81a..74ce9108a9cffed955678272826d2df110b0d9bc 100644
684--- a/quantum/pointing_device/pointing_device.c
685+++ b/quantum/pointing_device/pointing_device.c
686@@ -498,7 +498,7 @@ __attribute__((weak)) report_mouse_t pointing_device_task_combined_user(report_m
687
688 __attribute__((weak)) void pointing_device_keycode_handler(uint16_t keycode, bool pressed) {
689 if IS_MOUSEKEY_BUTTON (keycode) {
690- local_mouse_report.buttons = pointing_device_handle_buttons(local_mouse_report.buttons, pressed, keycode - KC_MS_BTN1);
691+ local_mouse_report.buttons = pointing_device_handle_buttons(local_mouse_report.buttons, pressed, keycode - QK_MOUSE_BUTTON_1);
692 pointing_device_send();
693 }
694 }
695diff --git a/quantum/pointing_device/pointing_device_auto_mouse.h b/quantum/pointing_device/pointing_device_auto_mouse.h
696index a596c065a31008f3e095d3738b3b316a020f7658..2c0d4d10434f732832740f4c3ca2cc736e4b22d9 100644
697--- a/quantum/pointing_device/pointing_device_auto_mouse.h
698+++ b/quantum/pointing_device/pointing_device_auto_mouse.h
699@@ -37,7 +37,7 @@
700 # define AUTO_MOUSE_TIME 650
701 #endif
702 #ifndef AUTO_MOUSE_DELAY
703-# define AUTO_MOUSE_DELAY GET_TAPPING_TERM(KC_MS_BTN1, &(keyrecord_t){})
704+# define AUTO_MOUSE_DELAY GET_TAPPING_TERM(QK_MOUSE_BUTTON_1, &(keyrecord_t){})
705 #endif
706 #ifndef AUTO_MOUSE_DEBOUNCE
707 # define AUTO_MOUSE_DEBOUNCE 25
708diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
709index 6ea5e13f3a9620889f1c1ea0bc579e0e712ddfbc..e1562077e5f3cd714ca3bec79692a5c539d731e3 100644
710--- a/quantum/quantum_keycodes_legacy.h
711+++ b/quantum/quantum_keycodes_legacy.h
712@@ -16,3 +16,42 @@
713 #define RGB_VAD QK_UNDERGLOW_VALUE_DOWN
714 #define RGB_SPI QK_UNDERGLOW_SPEED_UP
715 #define RGB_SPD QK_UNDERGLOW_SPEED_DOWN
716+
717+#define KC_MS_UP QK_MOUSE_CURSOR_UP
718+#define KC_MS_U QK_MOUSE_CURSOR_UP
719+#define KC_MS_DOWN QK_MOUSE_CURSOR_DOWN
720+#define KC_MS_D QK_MOUSE_CURSOR_DOWN
721+#define KC_MS_LEFT QK_MOUSE_CURSOR_LEFT
722+#define KC_MS_L QK_MOUSE_CURSOR_LEFT
723+#define KC_MS_RIGHT QK_MOUSE_CURSOR_RIGHT
724+#define KC_MS_R QK_MOUSE_CURSOR_RIGHT
725+#define KC_MS_BTN1 QK_MOUSE_BUTTON_1
726+#define KC_BTN1 QK_MOUSE_BUTTON_1
727+#define KC_MS_BTN2 QK_MOUSE_BUTTON_2
728+#define KC_BTN2 QK_MOUSE_BUTTON_2
729+#define KC_MS_BTN3 QK_MOUSE_BUTTON_3
730+#define KC_BTN3 QK_MOUSE_BUTTON_3
731+#define KC_MS_BTN4 QK_MOUSE_BUTTON_4
732+#define KC_BTN4 QK_MOUSE_BUTTON_4
733+#define KC_MS_BTN5 QK_MOUSE_BUTTON_5
734+#define KC_BTN5 QK_MOUSE_BUTTON_5
735+#define KC_MS_BTN6 QK_MOUSE_BUTTON_6
736+#define KC_BTN6 QK_MOUSE_BUTTON_6
737+#define KC_MS_BTN7 QK_MOUSE_BUTTON_7
738+#define KC_BTN7 QK_MOUSE_BUTTON_7
739+#define KC_MS_BTN8 QK_MOUSE_BUTTON_8
740+#define KC_BTN8 QK_MOUSE_BUTTON_8
741+#define KC_MS_WH_UP QK_MOUSE_WHEEL_UP
742+#define KC_WH_U QK_MOUSE_WHEEL_UP
743+#define KC_MS_WH_DOWN QK_MOUSE_WHEEL_DOWN
744+#define KC_WH_D QK_MOUSE_WHEEL_DOWN
745+#define KC_MS_WH_LEFT QK_MOUSE_WHEEL_LEFT
746+#define KC_WH_L QK_MOUSE_WHEEL_LEFT
747+#define KC_MS_WH_RIGHT QK_MOUSE_WHEEL_RIGHT
748+#define KC_WH_R QK_MOUSE_WHEEL_RIGHT
749+#define KC_MS_ACCEL0 QK_MOUSE_ACCELERATION_0
750+#define KC_ACL0 QK_MOUSE_ACCELERATION_0
751+#define KC_MS_ACCEL1 QK_MOUSE_ACCELERATION_1
752+#define KC_ACL1 QK_MOUSE_ACCELERATION_1
753+#define KC_MS_ACCEL2 QK_MOUSE_ACCELERATION_2
754+#define KC_ACL2 QK_MOUSE_ACCELERATION_2
755diff --git a/quantum/repeat_key.c b/quantum/repeat_key.c
756index 4567428723ac348235c4e283365ee413d087dcad..56f242f8b8472bf2a571a29585bd51628169d3bc 100644
757--- a/quantum/repeat_key.c
758+++ b/quantum/repeat_key.c
759@@ -220,10 +220,10 @@ uint16_t get_alt_repeat_key_keycode(void) {
760 {KC_BRIU, KC_BRID}, // Brightness Up / Down.
761 #endif // EXTRAKEY_ENABLE
762 #ifdef MOUSEKEY_ENABLE
763- {KC_MS_L, KC_MS_R}, // Mouse Cursor Left / Right.
764- {KC_MS_U, KC_MS_D}, // Mouse Cursor Up / Down.
765- {KC_WH_L, KC_WH_R}, // Mouse Wheel Left / Right.
766- {KC_WH_U, KC_WH_D}, // Mouse Wheel Up / Down.
767+ {MS_LEFT, MS_RGHT}, // Mouse Cursor Left / Right.
768+ {MS_UP, MS_DOWN}, // Mouse Cursor Up / Down.
769+ {MS_WHLL, MS_WHLR}, // Mouse Wheel Left / Right.
770+ {MS_WHLU, MS_WHLD}, // Mouse Wheel Up / Down.
771 #endif // MOUSEKEY_ENABLE
772 };
773 // clang-format on
774diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp
775index 18dd5360277b983043c0a1c02eec0245e84a5146..4c28ab4d20dd514530bd202d908922147ef674a7 100644
776--- a/tests/test_common/keycode_table.cpp
777+++ b/tests/test_common/keycode_table.cpp
778@@ -225,25 +225,25 @@ std::map<uint16_t, std::string> KEYCODE_ID_TABLE = {
779 {KC_ASSISTANT, "KC_ASSISTANT"},
780 {KC_MISSION_CONTROL, "KC_MISSION_CONTROL"},
781 {KC_LAUNCHPAD, "KC_LAUNCHPAD"},
782- {KC_MS_UP, "KC_MS_UP"},
783- {KC_MS_DOWN, "KC_MS_DOWN"},
784- {KC_MS_LEFT, "KC_MS_LEFT"},
785- {KC_MS_RIGHT, "KC_MS_RIGHT"},
786- {KC_MS_BTN1, "KC_MS_BTN1"},
787- {KC_MS_BTN2, "KC_MS_BTN2"},
788- {KC_MS_BTN3, "KC_MS_BTN3"},
789- {KC_MS_BTN4, "KC_MS_BTN4"},
790- {KC_MS_BTN5, "KC_MS_BTN5"},
791- {KC_MS_BTN6, "KC_MS_BTN6"},
792- {KC_MS_BTN7, "KC_MS_BTN7"},
793- {KC_MS_BTN8, "KC_MS_BTN8"},
794- {KC_MS_WH_UP, "KC_MS_WH_UP"},
795- {KC_MS_WH_DOWN, "KC_MS_WH_DOWN"},
796- {KC_MS_WH_LEFT, "KC_MS_WH_LEFT"},
797- {KC_MS_WH_RIGHT, "KC_MS_WH_RIGHT"},
798- {KC_MS_ACCEL0, "KC_MS_ACCEL0"},
799- {KC_MS_ACCEL1, "KC_MS_ACCEL1"},
800- {KC_MS_ACCEL2, "KC_MS_ACCEL2"},
801+ {QK_MOUSE_CURSOR_UP, "QK_MOUSE_CURSOR_UP"},
802+ {QK_MOUSE_CURSOR_DOWN, "QK_MOUSE_CURSOR_DOWN"},
803+ {QK_MOUSE_CURSOR_LEFT, "QK_MOUSE_CURSOR_LEFT"},
804+ {QK_MOUSE_CURSOR_RIGHT, "QK_MOUSE_CURSOR_RIGHT"},
805+ {QK_MOUSE_BUTTON_1, "QK_MOUSE_BUTTON_1"},
806+ {QK_MOUSE_BUTTON_2, "QK_MOUSE_BUTTON_2"},
807+ {QK_MOUSE_BUTTON_3, "QK_MOUSE_BUTTON_3"},
808+ {QK_MOUSE_BUTTON_4, "QK_MOUSE_BUTTON_4"},
809+ {QK_MOUSE_BUTTON_5, "QK_MOUSE_BUTTON_5"},
810+ {QK_MOUSE_BUTTON_6, "QK_MOUSE_BUTTON_6"},
811+ {QK_MOUSE_BUTTON_7, "QK_MOUSE_BUTTON_7"},
812+ {QK_MOUSE_BUTTON_8, "QK_MOUSE_BUTTON_8"},
813+ {QK_MOUSE_WHEEL_UP, "QK_MOUSE_WHEEL_UP"},
814+ {QK_MOUSE_WHEEL_DOWN, "QK_MOUSE_WHEEL_DOWN"},
815+ {QK_MOUSE_WHEEL_LEFT, "QK_MOUSE_WHEEL_LEFT"},
816+ {QK_MOUSE_WHEEL_RIGHT, "QK_MOUSE_WHEEL_RIGHT"},
817+ {QK_MOUSE_ACCELERATION_0, "QK_MOUSE_ACCELERATION_0"},
818+ {QK_MOUSE_ACCELERATION_1, "QK_MOUSE_ACCELERATION_1"},
819+ {QK_MOUSE_ACCELERATION_2, "QK_MOUSE_ACCELERATION_2"},
820 {KC_LEFT_CTRL, "KC_LEFT_CTRL"},
821 {KC_LEFT_SHIFT, "KC_LEFT_SHIFT"},
822 {KC_LEFT_ALT, "KC_LEFT_ALT"},