From 6fa11bf21913b5ccb531acc3c2baec963f4d384a Mon Sep 17 00:00:00 2001
From: Ryan
Date: Sun, 13 Oct 2024 03:43:50 +1100
Subject: Separate RGBLight/RGB Matrix keycode handling (#23679)

* Separate RGBLight/RGB Matrix keycode handling

* Remove `_DISABLE_KEYCODES` handling

* Update RGB Matrix keycode docs

* Update underglow keycodes for previously migrated boards

* Update keycodes for boards with custom handling

* Fix typos

* Fix bad merge---
 keyboards/matrix/m20add/keymaps/default/keymap.c | 2 +-
 keyboards/matrix/m20add/keymaps/iso/keymap.c     | 2 +-
 keyboards/matrix/m20add/rgb_ring.c               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'keyboards/matrix')

diff --git a/keyboards/matrix/m20add/keymaps/default/keymap.c b/keyboards/matrix/m20add/keymaps/default/keymap.c
index 92a34c6811..8167487a7a 100644
--- a/keyboards/matrix/m20add/keymaps/default/keymap.c
+++ b/keyboards/matrix/m20add/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_MUTE,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-		KC_NUM,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______, _______, _______,
+		KC_NUM,  UG_TOGG, UG_NEXT, UG_HUEU, UG_HUED, UG_SATU, UG_SATD, UG_VALU, UG_VALD, _______, _______, _______, _______, _______,          _______, _______, _______,
 		QK_BOOT, _______, _______, KC_F24, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
 		_______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______,                   KC_VOLU,
 		_______, _______, _______,                           KC_MPLY,                                       _______, _______, _______,          KC_MPRV, KC_VOLD, KC_MNXT),
diff --git a/keyboards/matrix/m20add/keymaps/iso/keymap.c b/keyboards/matrix/m20add/keymaps/iso/keymap.c
index 3d6cd8f073..1760fbe233 100644
--- a/keyboards/matrix/m20add/keymaps/iso/keymap.c
+++ b/keyboards/matrix/m20add/keymaps/iso/keymap.c
@@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_MUTE,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, 
 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
-		KC_NUM,  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,              _______, _______, _______, 
+		KC_NUM,  UG_TOGG, UG_NEXT, UG_HUEU, UG_HUED, UG_SATU, UG_SATD, UG_VALU, UG_VALD, _______, _______, _______, _______,              _______, _______, _______, 
 		QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,              KC_VOLU,
 		_______, _______, _______,                                    KC_MPLY,                             _______, _______, _______,     KC_MPRV, KC_VOLD, KC_MNXT),
diff --git a/keyboards/matrix/m20add/rgb_ring.c b/keyboards/matrix/m20add/rgb_ring.c
index 9b0e54a6b9..032745af6e 100644
--- a/keyboards/matrix/m20add/rgb_ring.c
+++ b/keyboards/matrix/m20add/rgb_ring.c
@@ -398,7 +398,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record)
 {
     if (record->event.pressed) {
         switch(keycode) {
-            case RGB_MOD:
+            case QK_UNDERGLOW_MODE_NEXT:
                 if (rgb_ring.state == RING_STATE_INIT) {
                     // in testing mode, do nothing
                     return false;
@@ -416,7 +416,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record)
                     }
                 }
                 break;
-            case RGB_RMOD:
+            case QK_UNDERGLOW_MODE_PREVIOUS:
                 if (rgb_ring.state == RING_STATE_INIT) {
                     // in testing mode, do nothing
                     return false;
-- 
cgit v1.2.3