Normalise Joystick and Programmable Button keycodes (#18832)

2 files changed, 5 insertions, 5 deletions

diff --git a/quantum/process_keycode/process_joystick.c b/quantum/process_keycode/process_joystick.c
index af69d3aa05..c4c6fb59a8 100644
--- a/quantum/process_keycode/process_joystick.c
+++ b/quantum/process_keycode/process_joystick.c
@@ -19,11 +19,11 @@
 
 bool process_joystick(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case JS_BUTTON0 ... JS_BUTTON_MAX:
+        case QK_JOYSTICK_BUTTON_MIN ... QK_JOYSTICK_BUTTON_MAX:
             if (record->event.pressed) {
-                register_joystick_button(keycode - JS_BUTTON0);
+                register_joystick_button(keycode - QK_JOYSTICK_BUTTON_MIN);
             } else {
-                unregister_joystick_button(keycode - JS_BUTTON0);
+                unregister_joystick_button(keycode - QK_JOYSTICK_BUTTON_MIN);
             }
             return false;
     }
diff --git a/quantum/process_keycode/process_programmable_button.c b/quantum/process_keycode/process_programmable_button.c
index 6379698848..d6a14e120c 100644
--- a/quantum/process_keycode/process_programmable_button.c
+++ b/quantum/process_keycode/process_programmable_button.c
@@ -19,8 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "programmable_button.h"
 
 bool process_programmable_button(uint16_t keycode, keyrecord_t *record) {
-    if (keycode >= PROGRAMMABLE_BUTTON_MIN && keycode <= PROGRAMMABLE_BUTTON_MAX) {
-        uint8_t button = keycode - PROGRAMMABLE_BUTTON_MIN + 1;
+    if (keycode >= QK_PROGRAMMABLE_BUTTON_MIN && keycode <= QK_PROGRAMMABLE_BUTTON_MAX) {
+        uint8_t button = keycode - QK_PROGRAMMABLE_BUTTON_MIN + 1;
         if (record->event.pressed) {
             programmable_button_register(button);
         } else {