Normalise Joystick and Programmable Button keycodes (#18832)

5 files changed, 19 insertions, 19 deletions

diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
index bc20d46d3a..46e0a128f9 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
@@ -17,15 +17,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
-#define L1_NUM1 PROGRAMMABLE_BUTTON_1
-#define L1_NUM2 PROGRAMMABLE_BUTTON_2
-#define L1_NUM3 PROGRAMMABLE_BUTTON_3
-#define L1_NUM4 PROGRAMMABLE_BUTTON_4
-#define L1_NUM5 PROGRAMMABLE_BUTTON_5
-#define L1_NUM6 PROGRAMMABLE_BUTTON_6
-#define L1_NUM7 PROGRAMMABLE_BUTTON_7
-#define L1_NUM8 PROGRAMMABLE_BUTTON_8
-#define L1_NUM9 PROGRAMMABLE_BUTTON_9
+#define L1_NUM1 QK_PROGRAMMABLE_BUTTON_1
+#define L1_NUM2 QK_PROGRAMMABLE_BUTTON_2
+#define L1_NUM3 QK_PROGRAMMABLE_BUTTON_3
+#define L1_NUM4 QK_PROGRAMMABLE_BUTTON_4
+#define L1_NUM5 QK_PROGRAMMABLE_BUTTON_5
+#define L1_NUM6 QK_PROGRAMMABLE_BUTTON_6
+#define L1_NUM7 QK_PROGRAMMABLE_BUTTON_7
+#define L1_NUM8 QK_PROGRAMMABLE_BUTTON_8
+#define L1_NUM9 QK_PROGRAMMABLE_BUTTON_9
 #else
 #define L1_NUM1 _______
 #define L1_NUM2 _______
diff --git a/keyboards/handwired/battleship_gamepad/keymaps/default/keymap.c b/keyboards/handwired/battleship_gamepad/keymaps/default/keymap.c
index 4f950a5d62..b59692fec5 100644
--- a/keyboards/handwired/battleship_gamepad/keymaps/default/keymap.c
+++ b/keyboards/handwired/battleship_gamepad/keymaps/default/keymap.c
@@ -33,9 +33,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, TG(2), KC_TRNS, KC_TRNS),
 	
 	[2] = LAYOUT(
-		KC_TRNS, KC_TRNS,   TG(2), JS_BUTTON0,  JS_BUTTON1,  JS_BUTTON2,  JS_BUTTON3,  JS_BUTTON4, 
-		KC_TRNS, KC_TRNS, KC_TRNS, JS_BUTTON5,  JS_BUTTON6,  JS_BUTTON7,  JS_BUTTON8,  JS_BUTTON9, 
-		KC_TRNS, KC_TRNS, KC_TRNS, JS_BUTTON10, JS_BUTTON11, JS_BUTTON12, JS_BUTTON13, JS_BUTTON14, 
-		KC_TRNS, KC_TRNS, KC_TRNS, JS_BUTTON15, JS_BUTTON16, JS_BUTTON17, JS_BUTTON18, JS_BUTTON19, 
-		KC_TRNS, KC_TRNS, KC_TRNS, JS_BUTTON20, JS_BUTTON21, JS_BUTTON22, JS_BUTTON23, JS_BUTTON24)
+		KC_TRNS, KC_TRNS,   TG(2), JS_0,  JS_1,  JS_2,  JS_3,  JS_4, 
+		KC_TRNS, KC_TRNS, KC_TRNS, JS_5,  JS_6,  JS_7,  JS_8,  JS_9, 
+		KC_TRNS, KC_TRNS, KC_TRNS, JS_10, JS_11, JS_12, JS_13, JS_14, 
+		KC_TRNS, KC_TRNS, KC_TRNS, JS_15, JS_16, JS_17, JS_18, JS_19, 
+		KC_TRNS, KC_TRNS, KC_TRNS, JS_20, JS_21, JS_22, JS_23, JS_24)
 };
diff --git a/keyboards/handwired/misterdeck/keymaps/default/keymap.c b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
index b8ed3cb9d9..0992e06f87 100644
--- a/keyboards/handwired/misterdeck/keymaps/default/keymap.c
+++ b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [NORMAL_LAYER] = LAYOUT(
         C(S(KC_F1)), C(S(KC_F2)), C(S(KC_F3)), C(S(KC_F4)),
         C(S(KC_F5)), C(S(KC_F6)), C(S(KC_F7)), C(S(KC_F8)),
-        JS_BUTTON0,  JS_BUTTON1,  JS_BUTTON2,  JS_BUTTON3
+        JS_0,        JS_1,        JS_2,        JS_3
     )
 };
 
diff --git a/keyboards/handwired/onekey/keymaps/joystick/keymap.c b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
index c74707e931..96115aa496 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
@@ -5,7 +5,7 @@
 #endif
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT_ortho_1x1(JS_BUTTON0)
+    LAYOUT_ortho_1x1(JS_0)
 };
 
 void matrix_scan_user() {
diff --git a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
index 8da2afc97a..e6f9678fbb 100644
--- a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
+++ b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
@@ -5,9 +5,9 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-                                    JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6,
-          KC_NO,   JS_BUTTON7,  KC_NO,
-                                    JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6
+                                    JS_0,JS_1,JS_2,JS_3,JS_4,JS_5,JS_6,
+          KC_NO,   JS_7,  KC_NO,
+                                    JS_0,JS_1,JS_2,JS_3,JS_4,JS_5,JS_6
     )
 };