Cian-H/qmk_firmware
1
0
Fork 0
mirror of https://github.com/Cian-H/qmk_firmware.git synced 2026-08-21 13:22:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Separate RGBLight/RGB Matrix keycode handling (#23679)

Browse Source 
* 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
This commit is contained in:
Ryan
2024-10-12 18:43:50 +02:00
committed by GitHub
parent 5c97a78ce6
commit 6fa11bf219
267 changed files with 1228 additions and 2276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
keyboards/obosob/arch_36/keymaps/default/keymap.c
+11 -11
View File
@@ -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;
keyboards/obosob/arch_36/keymaps/obosob/keymap.c
+13 -13
View File
@@ -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;