aboutsummaryrefslogtreecommitdiff
path: root/keyboards/obosob/arch_36
diff options
context:
space:
mode:
authorRyan <[email protected]>2024-10-13 03:43:50 +1100
committerGitHub <[email protected]>2024-10-12 18:43:50 +0200
commit6fa11bf21913b5ccb531acc3c2baec963f4d384a (patch)
treeaaf6188a4579949cc1fbac61d0fee5234b97996a /keyboards/obosob/arch_36
parent5c97a78ce6ab45643dcb420ba2ad20c30dcd5b8a (diff)
downloadqmk_firmware-6fa11bf21913b5ccb531acc3c2baec963f4d384a.tar.gz
qmk_firmware-6fa11bf21913b5ccb531acc3c2baec963f4d384a.zip
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
Diffstat (limited to 'keyboards/obosob/arch_36')
-rw-r--r--keyboards/obosob/arch_36/keymaps/default/keymap.c22
-rw-r--r--keyboards/obosob/arch_36/keymaps/obosob/keymap.c26
2 files changed, 24 insertions, 24 deletions
diff --git a/keyboards/obosob/arch_36/keymaps/default/keymap.c b/keyboards/obosob/arch_36/keymaps/default/keymap.c
index 6351944e37..abe3c2f711 100644
--- a/keyboards/obosob/arch_36/keymaps/default/keymap.c
+++ b/keyboards/obosob/arch_36/keymaps/default/keymap.c
@@ -107,14 +107,14 @@ uint16_t last_rgb_char = 0;
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch(keycode) {
- case RGB_TOG:
- case RGB_MOD:
- case RGB_HUD:
- case RGB_HUI:
- case RGB_SAD:
- case RGB_SAI:
- case RGB_VAI:
- case RGB_VAD:
+ case QK_UNDERGLOW_TOGGLE:
+ case QK_UNDERGLOW_MODE_NEXT:
+ case QK_UNDERGLOW_HUE_DOWN:
+ case QK_UNDERGLOW_HUE_UP:
+ case QK_UNDERGLOW_SATURATION_DOWN:
+ case QK_UNDERGLOW_SATURATION_UP:
+ case QK_UNDERGLOW_VALUE_UP:
+ case QK_UNDERGLOW_VALUE_DOWN:
rgb_edit_timer = timer_read();
last_rgb_char = keycode;
return true;
@@ -152,9 +152,9 @@ void render_rgb_state(void) {
uint8_t hue = (rgblight_get_hue()*width/255),
sat = (rgblight_get_sat()*width/255),
val = (rgblight_get_val()*width/255);
- bool changing_hue = timer_elapsed(rgb_edit_timer) < 1000 && (last_rgb_char == RGB_HUI || last_rgb_char == RGB_HUD);
- bool changing_sat = timer_elapsed(rgb_edit_timer) < 1000 && (last_rgb_char == RGB_SAI || last_rgb_char == RGB_SAD);
- bool changing_val = timer_elapsed(rgb_edit_timer) < 1000 && (last_rgb_char == RGB_VAI || last_rgb_char == RGB_VAD);
+ bool changing_hue = timer_elapsed(rgb_edit_timer) < 1000 && (last_rgb_char == QK_UNDERGLOW_HUE_UP || last_rgb_char == QK_UNDERGLOW_HUE_DOWN);
+ bool changing_sat = timer_elapsed(rgb_edit_timer) < 1000 && (last_rgb_char == QK_UNDERGLOW_SATURATION_UP || last_rgb_char == QK_UNDERGLOW_SATURATION_DOWN);
+ bool changing_val = timer_elapsed(rgb_edit_timer) < 1000 && (last_rgb_char == QK_UNDERGLOW_VALUE_UP || last_rgb_char == QK_UNDERGLOW_VALUE_DOWN);
uint8_t i;
diff --git a/keyboards/obosob/arch_36/keymaps/obosob/keymap.c b/keyboards/obosob/arch_36/keymaps/obosob/keymap.c
index 27654b07b2..c36b5601b0 100644
--- a/keyboards/obosob/arch_36/keymaps/obosob/keymap.c
+++ b/keyboards/obosob/arch_36/keymaps/obosob/keymap.c
@@ -220,8 +220,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// |________| |________|
[_ADJUST] = LAYOUT_split_3x5_3(
XXXXXXX, WOKE, EE_CLR, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, QWERTY, COLEMAK, XXXXXXX, XXXXXXX,
- XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, QWERTY, COLEMAK, XXXXXXX, XXXXXXX,
+ XXXXXXX, UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
),
};
@@ -369,14 +369,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
woke_mode = !woke_mode;
}
return false;
- case RGB_TOG:
- case RGB_MOD:
- case RGB_HUD:
- case RGB_HUI:
- case RGB_SAD:
- case RGB_SAI:
- case RGB_VAI:
- case RGB_VAD:
+ case QK_UNDERGLOW_TOGGLE:
+ case QK_UNDERGLOW_MODE_NEXT:
+ case QK_UNDERGLOW_HUE_DOWN:
+ case QK_UNDERGLOW_HUE_UP:
+ case QK_UNDERGLOW_SATURATION_DOWN:
+ case QK_UNDERGLOW_SATURATION_UP:
+ case QK_UNDERGLOW_VALUE_UP:
+ case QK_UNDERGLOW_VALUE_DOWN:
rgb_edit_timer = timer_read();
last_rgb_char = keycode;
return true;
@@ -445,9 +445,9 @@ void render_rgb_state(void) {
uint8_t hue = (rgblight_get_hue()*width/255),
sat = (rgblight_get_sat()*width/255),
val = (rgblight_get_val()*width/255);
- bool changing_hue = timer_elapsed(rgb_edit_timer) < 1000 && (last_rgb_char == RGB_HUI || last_rgb_char == RGB_HUD);
- bool changing_sat = timer_elapsed(rgb_edit_timer) < 1000 && (last_rgb_char == RGB_SAI || last_rgb_char == RGB_SAD);
- bool changing_val = timer_elapsed(rgb_edit_timer) < 1000 && (last_rgb_char == RGB_VAI || last_rgb_char == RGB_VAD);
+ bool changing_hue = timer_elapsed(rgb_edit_timer) < 1000 && (last_rgb_char == QK_UNDERGLOW_HUE_UP || last_rgb_char == QK_UNDERGLOW_HUE_DOWN);
+ bool changing_sat = timer_elapsed(rgb_edit_timer) < 1000 && (last_rgb_char == QK_UNDERGLOW_SATURATION_UP || last_rgb_char == QK_UNDERGLOW_SATURATION_DOWN);
+ bool changing_val = timer_elapsed(rgb_edit_timer) < 1000 && (last_rgb_char == QK_UNDERGLOW_VALUE_UP || last_rgb_char == QK_UNDERGLOW_VALUE_DOWN);
uint8_t i;