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
author: Ryan <fauxpark@gmail.com> 2024-10-13 03:43:50 +1100
committer: GitHub <noreply@github.com> 2024-10-12 18:43:50 +0200
commit: 6fa11bf21913b5ccb531acc3c2baec963f4d384a (patch)
tree: aaf6188a4579949cc1fbac61d0fee5234b97996a /keyboards/skyloong
parent: 5c97a78ce6ab45643dcb420ba2ad20c30dcd5b8a (diff)
6 files changed, 11 insertions, 11 deletions
diff --git a/keyboards/skyloong/gk61/pro/keymaps/default/keymap.c b/keyboards/skyloong/gk61/pro/keymaps/default/keymap.c
index 9534f25d80..be6501fb8f 100644
--- a/keyboards/skyloong/gk61/pro/keymaps/default/keymap.c
+++ b/keyboards/skyloong/gk61/pro/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [1] = LAYOUT_all(
        KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,       KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,
-        _______,  RGB_TOG,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RM_TOGG,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
        _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______,            _______,
        _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,            _______,
        _______,  _______,  _______,            _______,  _______,     _______,            _______,  _______,  _______,  _______,            _______
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }
+    [1] = { ENCODER_CCW_CW(RM_HUED, RM_HUEU) }
 };
 #endif
diff --git a/keyboards/skyloong/gk61/pro/pro.c b/keyboards/skyloong/gk61/pro/pro.c
index 49841b2ee5..2299977e0e 100644
--- a/keyboards/skyloong/gk61/pro/pro.c
+++ b/keyboards/skyloong/gk61/pro/pro.c
@@ -91,7 +91,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
    }
    switch (keycode) {
 #    ifdef RGB_MATRIX_ENABLE
-        case RGB_TOG:
+        case QK_RGB_MATRIX_TOGGLE:
            if (record->event.pressed) {
                switch (rgb_matrix_get_flags()) {
                    case LED_FLAG_ALL: {
diff --git a/keyboards/skyloong/gk61/pro_48/keymaps/default/keymap.c b/keyboards/skyloong/gk61/pro_48/keymaps/default/keymap.c
index 9534f25d80..be6501fb8f 100644
--- a/keyboards/skyloong/gk61/pro_48/keymaps/default/keymap.c
+++ b/keyboards/skyloong/gk61/pro_48/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [1] = LAYOUT_all(
        KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,       KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,
-        _______,  RGB_TOG,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  RM_TOGG,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
        _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,  _______,            _______,
        _______,  _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,            _______,
        _______,  _______,  _______,            _______,  _______,     _______,            _______,  _______,  _______,  _______,            _______
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }
+    [1] = { ENCODER_CCW_CW(RM_HUED, RM_HUEU) }
 };
 #endif
diff --git a/keyboards/skyloong/gk61/pro_48/pro_48.c b/keyboards/skyloong/gk61/pro_48/pro_48.c
index ff49f5d22f..6da76a1767 100644
--- a/keyboards/skyloong/gk61/pro_48/pro_48.c
+++ b/keyboards/skyloong/gk61/pro_48/pro_48.c
@@ -165,7 +165,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
    }
    switch (keycode) {
 #    ifdef RGB_MATRIX_ENABLE
-        case RGB_TOG:
+        case QK_RGB_MATRIX_TOGGLE:
            if (record->event.pressed) {
                switch (rgb_matrix_get_flags()) {
                    case LED_FLAG_ALL: {
diff --git a/keyboards/skyloong/qk21/v1/keymaps/default/keymap.c b/keyboards/skyloong/qk21/v1/keymaps/default/keymap.c
index 8cb1d20085..50796d2f6e 100644
--- a/keyboards/skyloong/qk21/v1/keymaps/default/keymap.c
+++ b/keyboards/skyloong/qk21/v1/keymaps/default/keymap.c
@@ -44,11 +44,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * └───────┴───┘───┘
     */
    [1] = LAYOUT_numpad_6x4(
-        QK_BOOT,   RGB_MOD, _______, _______,
+        QK_BOOT,   RM_NEXT, _______, _______,
-        _______,   RGB_HUD, RGB_HUI, RGB_VAD,
+        _______,   RM_HUED, RM_HUEU, RM_VALD,
        KC_HOME,     KC_UP, KC_PGUP,
-        KC_LEFT,  RGB_M_SW, KC_RGHT, RGB_VAI,
+        KC_LEFT,  RGB_M_SW, KC_RGHT, RM_VALU,
        KC_END,    KC_DOWN, KC_PGDN,
-        KC_INS,              KC_DEL, RGB_TOG
+        KC_INS,              KC_DEL, RM_TOGG
    )
 };
diff --git a/keyboards/skyloong/qk21/v1/v1.c b/keyboards/skyloong/qk21/v1/v1.c
index 9630d3e223..ae85eaab39 100644
--- a/keyboards/skyloong/qk21/v1/v1.c
+++ b/keyboards/skyloong/qk21/v1/v1.c
@@ -11,7 +11,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
    }
    switch (keycode) {
 #    ifdef RGB_MATRIX_ENABLE
-        case RGB_TOG:
+        case QK_RGB_MATRIX_TOGGLE:
            if (record->event.pressed) {
                switch (rgb_matrix_get_flags()) {
                    case LED_FLAG_ALL: {
author	Ryan <fauxpark@gmail.com>	2024-10-13 03:43:50 +1100
committer	GitHub <noreply@github.com>	2024-10-12 18:43:50 +0200
commit	6fa11bf21913b5ccb531acc3c2baec963f4d384a (patch)
tree	aaf6188a4579949cc1fbac61d0fee5234b97996a /keyboards/skyloong
parent	5c97a78ce6ab45643dcb420ba2ad20c30dcd5b8a (diff)

diff --git a/keyboards/skyloong/gk61/pro/keymaps/default/keymap.c b/keyboards/skyloong/gk61/pro/keymaps/default/keymap.c index 9534f25d80..be6501fb8f 100644 --- a/keyboards/skyloong/gk61/pro/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk61/pro/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27		27
28	[1] = LAYOUT_all(	28	[1] = LAYOUT_all(
29	KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,	29	KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
30	_______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	30	_______, RM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	31	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
32	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	32	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
33	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______	33	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
38	#if defined(ENCODER_MAP_ENABLE)	38	#if defined(ENCODER_MAP_ENABLE)
39	const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {	39	const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
40	[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },	40	[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
41	[1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }	41	[1] = { ENCODER_CCW_CW(RM_HUED, RM_HUEU) }
42	};	42	};
43	#endif	43	#endif
44		44


diff --git a/keyboards/skyloong/gk61/pro/pro.c b/keyboards/skyloong/gk61/pro/pro.c index 49841b2ee5..2299977e0e 100644 --- a/keyboards/skyloong/gk61/pro/pro.c +++ b/keyboards/skyloong/gk61/pro/pro.c
@@ -91,7 +91,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
91	}	91	}
92	switch (keycode) {	92	switch (keycode) {
93	# ifdef RGB_MATRIX_ENABLE	93	# ifdef RGB_MATRIX_ENABLE
94	case RGB_TOG:	94	case QK_RGB_MATRIX_TOGGLE:
95	if (record->event.pressed) {	95	if (record->event.pressed) {
96	switch (rgb_matrix_get_flags()) {	96	switch (rgb_matrix_get_flags()) {
97	case LED_FLAG_ALL: {	97	case LED_FLAG_ALL: {


diff --git a/keyboards/skyloong/gk61/pro_48/keymaps/default/keymap.c b/keyboards/skyloong/gk61/pro_48/keymaps/default/keymap.c index 9534f25d80..be6501fb8f 100644 --- a/keyboards/skyloong/gk61/pro_48/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk61/pro_48/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27		27
28	[1] = LAYOUT_all(	28	[1] = LAYOUT_all(
29	KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,	29	KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
30	_______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	30	_______, RM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	31	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
32	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	32	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
33	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______	33	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
38	#if defined(ENCODER_MAP_ENABLE)	38	#if defined(ENCODER_MAP_ENABLE)
39	const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {	39	const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
40	[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },	40	[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
41	[1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }	41	[1] = { ENCODER_CCW_CW(RM_HUED, RM_HUEU) }
42	};	42	};
43	#endif	43	#endif
44		44


diff --git a/keyboards/skyloong/gk61/pro_48/pro_48.c b/keyboards/skyloong/gk61/pro_48/pro_48.c index ff49f5d22f..6da76a1767 100644 --- a/keyboards/skyloong/gk61/pro_48/pro_48.c +++ b/keyboards/skyloong/gk61/pro_48/pro_48.c
@@ -165,7 +165,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
165	}	165	}
166	switch (keycode) {	166	switch (keycode) {
167	# ifdef RGB_MATRIX_ENABLE	167	# ifdef RGB_MATRIX_ENABLE
168	case RGB_TOG:	168	case QK_RGB_MATRIX_TOGGLE:
169	if (record->event.pressed) {	169	if (record->event.pressed) {
170	switch (rgb_matrix_get_flags()) {	170	switch (rgb_matrix_get_flags()) {
171	case LED_FLAG_ALL: {	171	case LED_FLAG_ALL: {


diff --git a/keyboards/skyloong/qk21/v1/keymaps/default/keymap.c b/keyboards/skyloong/qk21/v1/keymaps/default/keymap.c index 8cb1d20085..50796d2f6e 100644 --- a/keyboards/skyloong/qk21/v1/keymaps/default/keymap.c +++ b/keyboards/skyloong/qk21/v1/keymaps/default/keymap.c
@@ -44,11 +44,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
44	* └───────┴───┘───┘	44	* └───────┴───┘───┘
45	*/	45	*/
46	[1] = LAYOUT_numpad_6x4(	46	[1] = LAYOUT_numpad_6x4(
47	QK_BOOT, RGB_MOD, _______, _______,	47	QK_BOOT, RM_NEXT, _______, _______,
48	_______, RGB_HUD, RGB_HUI, RGB_VAD,	48	_______, RM_HUED, RM_HUEU, RM_VALD,
49	KC_HOME, KC_UP, KC_PGUP,	49	KC_HOME, KC_UP, KC_PGUP,
50	KC_LEFT, RGB_M_SW, KC_RGHT, RGB_VAI,	50	KC_LEFT, RGB_M_SW, KC_RGHT, RM_VALU,
51	KC_END, KC_DOWN, KC_PGDN,	51	KC_END, KC_DOWN, KC_PGDN,
52	KC_INS, KC_DEL, RGB_TOG	52	KC_INS, KC_DEL, RM_TOGG
53	)	53	)
54	};	54	};


diff --git a/keyboards/skyloong/qk21/v1/v1.c b/keyboards/skyloong/qk21/v1/v1.c index 9630d3e223..ae85eaab39 100644 --- a/keyboards/skyloong/qk21/v1/v1.c +++ b/keyboards/skyloong/qk21/v1/v1.c
@@ -11,7 +11,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
11	}	11	}
12	switch (keycode) {	12	switch (keycode) {
13	# ifdef RGB_MATRIX_ENABLE	13	# ifdef RGB_MATRIX_ENABLE
14	case RGB_TOG:	14	case QK_RGB_MATRIX_TOGGLE:
15	if (record->event.pressed) {	15	if (record->event.pressed) {
16	switch (rgb_matrix_get_flags()) {	16	switch (rgb_matrix_get_flags()) {
17	case LED_FLAG_ALL: {	17	case LED_FLAG_ALL: {