diff options
Diffstat (limited to 'keyboards/gmmk/pro/rev1/iso')
| -rw-r--r-- | keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c | 18 | ||||
| -rw-r--r-- | keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c | 9 |
2 files changed, 15 insertions, 12 deletions
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c index 0811f1a33a..44fed8fd29 100644 --- a/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c +++ b/keyboards/gmmk/pro/rev1/iso/keymaps/gourdo1/keymap.c @@ -246,8 +246,10 @@ void hurt_paddle(void) { bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { if (get_rgb_nightmode()) rgb_matrix_set_color_all(RGB_OFF); + led_t led_state = host_keyboard_led_state(); + // Scroll Lock RGB setup - if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) { + if (led_state.scroll_lock) { rgb_matrix_set_color(LED_L3, RGB_RED); rgb_matrix_set_color(LED_L4, RGB_RED); rgb_matrix_set_color(LED_TAB, RGB_RED); @@ -257,7 +259,7 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { /* // System NumLock warning indicator RGB setup #ifdef INVERT_NUMLOCK_INDICATOR - if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // on if NUM lock is OFF to bring attention to overlay numpad not functional when enabled + if (!led_state.num_lock) { // on if NUM lock is OFF to bring attention to overlay numpad not functional when enabled rgb_matrix_set_color(LED_GRV, RGB_ORANGE2); rgb_matrix_set_color(LED_L1, RGB_ORANGE2); rgb_matrix_set_color(LED_L2, RGB_ORANGE2); @@ -265,7 +267,7 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { rgb_matrix_set_color(LED_FN, RGB_ORANGE2); } #else - if (IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // Normal, on if NUM lock is ON + if (led_state.num_lock) { // Normal, on if NUM lock is ON rgb_matrix_set_color(LED_GRV, RGB_ORANGE2); rgb_matrix_set_color(LED_L1, RGB_ORANGE2); rgb_matrix_set_color(LED_L2, RGB_ORANGE2); @@ -276,7 +278,7 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { */ // CapsLock RGB setup - if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { + if (led_state.caps_lock) { if (user_config.rgb_hilite_caps) { if (user_config.rgb_english_caps) { for (uint8_t i = 0; i < ARRAYSIZE(LED_LIST_LETTERS); i++) { @@ -368,11 +370,11 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { // System NumLock warning indicator RGB setup #ifdef INVERT_NUMLOCK_INDICATOR - if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // on if NUM lock is OFF to bring attention to overlay numpad not functional when enabled + if (!led_state.num_lock) { // on if NUM lock is OFF to bring attention to overlay numpad not functional when enabled rgb_matrix_set_color(LED_N, RGB_ORANGE2); } #else - if (IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // Normal, on if NUM lock is ON + if (led_state.num_lock) { // Normal, on if NUM lock is ON rgb_matrix_set_color(LED_N, RGB_ORANGE2); } #endif // INVERT_NUMLOCK_INDICATOR @@ -445,11 +447,11 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { // Numpad & Mouse Keys overlay RGB case _NUMPADMOUSE: #ifdef INVERT_NUMLOCK_INDICATOR - if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // on if NUM lock is OFF to bring attention to overlay numpad not functional when enabled + if (!led_state.num_lock) { // on if NUM lock is OFF to bring attention to overlay numpad not functional when enabled rgb_matrix_set_color(LED_N, RGB_ORANGE2); } #else - if (IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // Normal, on if NUM lock is ON + if (led_state.num_lock) { // Normal, on if NUM lock is ON rgb_matrix_set_color(LED_N, RGB_ORANGE2); } #endif // INVERT_NUMLOCK_INDICATOR diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c index 068ded84fb..82359551d1 100644 --- a/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c +++ b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c @@ -110,25 +110,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #ifdef RGB_MATRIX_ENABLE // Capslock, Scroll lock and Numlock indicator on Left side lights. bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + led_t led_state = host_keyboard_led_state(); if (get_rgb_nightmode()) rgb_matrix_set_color_all(RGB_OFF); - if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) { + if (led_state.scroll_lock) { rgb_matrix_set_color(LED_L1, RGB_GREEN); rgb_matrix_set_color(LED_L2, RGB_GREEN); } #ifdef INVERT_NUMLOCK_INDICATOR - if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // on if NUM lock is OFF + if (!led_state.num_lock) { // on if NUM lock is OFF rgb_matrix_set_color(LED_L3, RGB_MAGENTA); rgb_matrix_set_color(LED_L4, RGB_MAGENTA); } #else - if (IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // Normal, on if NUM lock is ON + if (led_state.num_lock) { // Normal, on if NUM lock is ON rgb_matrix_set_color(LED_L3, RGB_MAGENTA); rgb_matrix_set_color(LED_L4, RGB_MAGENTA); } #endif // INVERT_NUMLOCK_INDICATOR - if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { + if (led_state.caps_lock) { rgb_matrix_set_color(LED_L5, RGB_RED); rgb_matrix_set_color(LED_L6, RGB_RED); rgb_matrix_set_color(LED_L7, RGB_RED); |