Merge upstream master

1 files changed, 4 insertions, 4 deletions

diff --git a/quantum/process_keycode/process_programmable_button.c b/quantum/process_keycode/process_programmable_button.c
index c6e77faacc..03034edb61 100644
--- a/quantum/process_keycode/process_programmable_button.c
+++ b/quantum/process_keycode/process_programmable_button.c
@@ -19,12 +19,12 @@ 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 (IS_QK_PROGRAMMABLE_BUTTON(keycode)) {
+        uint8_t button = keycode - QK_PROGRAMMABLE_BUTTON + 1;
         if (record->event.pressed) {
-            programmable_button_on(button);
+            programmable_button_register(button);
         } else {
-            programmable_button_off(button);
+            programmable_button_unregister(button);
         }
     }
     return true;