Macro keycode name refactoring (#18958)

1 files changed, 65 insertions, 34 deletions

diff --git a/quantum/keycodes.h b/quantum/keycodes.h
index 6772bb6a4a..e3c9321d16 100644
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@@ -582,38 +582,38 @@ enum qk_keycode_defines {
     QK_STENO_GEMINI = 0x74F1,
     QK_STENO_COMB = 0x74F2,
     QK_STENO_COMB_MAX = 0x74FC,
-    MACRO_0 = 0x7700,
-    MACRO_1 = 0x7701,
-    MACRO_2 = 0x7702,
-    MACRO_3 = 0x7703,
-    MACRO_4 = 0x7704,
-    MACRO_5 = 0x7705,
-    MACRO_6 = 0x7706,
-    MACRO_7 = 0x7707,
-    MACRO_8 = 0x7708,
-    MACRO_9 = 0x7709,
-    MACRO_10 = 0x770A,
-    MACRO_11 = 0x770B,
-    MACRO_12 = 0x770C,
-    MACRO_13 = 0x770D,
-    MACRO_14 = 0x770E,
-    MACRO_15 = 0x770F,
-    MACRO_16 = 0x7710,
-    MACRO_17 = 0x7711,
-    MACRO_18 = 0x7712,
-    MACRO_19 = 0x7713,
-    MACRO_20 = 0x7714,
-    MACRO_21 = 0x7715,
-    MACRO_22 = 0x7716,
-    MACRO_23 = 0x7717,
-    MACRO_24 = 0x7718,
-    MACRO_25 = 0x7719,
-    MACRO_26 = 0x771A,
-    MACRO_27 = 0x771B,
-    MACRO_28 = 0x771C,
-    MACRO_29 = 0x771D,
-    MACRO_30 = 0x771E,
-    MACRO_31 = 0x771F,
+    QK_MACRO_0 = 0x7700,
+    QK_MACRO_1 = 0x7701,
+    QK_MACRO_2 = 0x7702,
+    QK_MACRO_3 = 0x7703,
+    QK_MACRO_4 = 0x7704,
+    QK_MACRO_5 = 0x7705,
+    QK_MACRO_6 = 0x7706,
+    QK_MACRO_7 = 0x7707,
+    QK_MACRO_8 = 0x7708,
+    QK_MACRO_9 = 0x7709,
+    QK_MACRO_10 = 0x770A,
+    QK_MACRO_11 = 0x770B,
+    QK_MACRO_12 = 0x770C,
+    QK_MACRO_13 = 0x770D,
+    QK_MACRO_14 = 0x770E,
+    QK_MACRO_15 = 0x770F,
+    QK_MACRO_16 = 0x7710,
+    QK_MACRO_17 = 0x7711,
+    QK_MACRO_18 = 0x7712,
+    QK_MACRO_19 = 0x7713,
+    QK_MACRO_20 = 0x7714,
+    QK_MACRO_21 = 0x7715,
+    QK_MACRO_22 = 0x7716,
+    QK_MACRO_23 = 0x7717,
+    QK_MACRO_24 = 0x7718,
+    QK_MACRO_25 = 0x7719,
+    QK_MACRO_26 = 0x771A,
+    QK_MACRO_27 = 0x771B,
+    QK_MACRO_28 = 0x771C,
+    QK_MACRO_29 = 0x771D,
+    QK_MACRO_30 = 0x771E,
+    QK_MACRO_31 = 0x771F,
     BL_ON = 0x7800,
     BL_OFF = 0x7801,
     BL_DEC = 0x7802,
@@ -1000,6 +1000,38 @@ enum qk_keycode_defines {
     CK_UP      = CLICKY_UP,
     CK_DOWN    = CLICKY_DOWN,
     CK_RST     = CLICKY_RESET,
+    MC_0       = QK_MACRO_0,
+    MC_1       = QK_MACRO_1,
+    MC_2       = QK_MACRO_2,
+    MC_3       = QK_MACRO_3,
+    MC_4       = QK_MACRO_4,
+    MC_5       = QK_MACRO_5,
+    MC_6       = QK_MACRO_6,
+    MC_7       = QK_MACRO_7,
+    MC_8       = QK_MACRO_8,
+    MC_9       = QK_MACRO_9,
+    MC_10      = QK_MACRO_10,
+    MC_11      = QK_MACRO_11,
+    MC_12      = QK_MACRO_12,
+    MC_13      = QK_MACRO_13,
+    MC_14      = QK_MACRO_14,
+    MC_15      = QK_MACRO_15,
+    MC_16      = QK_MACRO_16,
+    MC_17      = QK_MACRO_17,
+    MC_18      = QK_MACRO_18,
+    MC_19      = QK_MACRO_19,
+    MC_20      = QK_MACRO_20,
+    MC_21      = QK_MACRO_21,
+    MC_22      = QK_MACRO_22,
+    MC_23      = QK_MACRO_23,
+    MC_24      = QK_MACRO_24,
+    MC_25      = QK_MACRO_25,
+    MC_26      = QK_MACRO_26,
+    MC_27      = QK_MACRO_27,
+    MC_28      = QK_MACRO_28,
+    MC_29      = QK_MACRO_29,
+    MC_30      = QK_MACRO_30,
+    MC_31      = QK_MACRO_31,
     RGB_MOD    = RGB_MODE_FORWARD,
     RGB_RMOD   = RGB_MODE_REVERSE,
     RGB_M_P    = RGB_MODE_PLAIN,
@@ -1108,8 +1140,7 @@ enum qk_keycode_defines {
 #define IS_PROGRAMMABLE_BUTTON_KEYCODE(code) ((code) >= QK_PROGRAMMABLE_BUTTON_1 && (code) <= QK_PROGRAMMABLE_BUTTON_32)
 #define IS_AUDIO_KEYCODE(code) ((code) >= AU_ON && (code) <= MUV_DE)
 #define IS_STENO_KEYCODE(code) ((code) >= QK_STENO_BOLT && (code) <= QK_STENO_COMB_MAX)
-#define IS_MACRO_KEYCODE(code) ((code) >= MACRO_0 && (code) <= MACRO_31)
+#define IS_MACRO_KEYCODE(code) ((code) >= QK_MACRO_0 && (code) <= QK_MACRO_31)
 #define IS_BACKLIGHT_KEYCODE(code) ((code) >= BL_ON && (code) <= BL_BRTG)
 #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE)
 #define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_AUTOCORRECT_TOGGLE)
-