Fix Per Key LED Indicator Callbacks (#18450)
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
@ -441,8 +441,12 @@ Where `28` is an unused index from `eeconfig.h`.
|
||||
|
||||
If you want to set custom indicators, such as an LED for Caps Lock, or layer indication, you can use the `led_matrix_indicators_kb` or `led_matrix_indicators_user` function for that:
|
||||
```c
|
||||
void led_matrix_indicators_kb(void) {
|
||||
bool led_matrix_indicators_kb(void) {
|
||||
if (!led_matrix_indicators_user()) {
|
||||
return false;
|
||||
}
|
||||
led_matrix_set_value(index, value);
|
||||
return true;
|
||||
}
|
||||
```
|
||||
|
||||
@ -451,5 +455,6 @@ In addition, there are the advanced indicator functions. These are aimed at tho
|
||||
```c
|
||||
void led_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
LED_MATRIX_INDICATOR_SET_VALUE(index, value);
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
@ -888,16 +888,21 @@ Where `28` is an unused index from `eeconfig.h`.
|
||||
|
||||
If you want to set custom indicators, such as an LED for Caps Lock, or layer indication, you can use the `rgb_matrix_indicators_kb` or `rgb_matrix_indicators_user` function for that:
|
||||
```c
|
||||
void rgb_matrix_indicators_kb(void) {
|
||||
bool rgb_matrix_indicators_kb(void) {
|
||||
if (!rgb_matrix_indicators_user()) {
|
||||
return false;
|
||||
}
|
||||
rgb_matrix_set_color(index, red, green, blue);
|
||||
return true;
|
||||
}
|
||||
```
|
||||
|
||||
In addition, there are the advanced indicator functions. These are aimed at those with heavily customized displays, where rendering every LED per cycle is expensive. Such as some of the "drashna" layouts. This includes a special macro to help make this easier to use: `RGB_MATRIX_INDICATOR_SET_COLOR(i, r, g, b)`.
|
||||
|
||||
```c
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
||||
@ -905,7 +910,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
|
||||
Caps Lock indicator on alphanumeric flagged keys:
|
||||
```c
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
for (uint8_t i = led_min; i <= led_max; i++) {
|
||||
if (g_led_config.flags[i] & LED_FLAG_KEYLIGHT) {
|
||||
@ -913,12 +918,13 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
||||
Layer indicator on all keys:
|
||||
```c
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
for (uint8_t i = led_min; i <= led_max; i++) {
|
||||
switch(get_highest_layer(layer_state|default_layer_state)) {
|
||||
case 2:
|
||||
@ -931,12 +937,13 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
||||
Layer indicator only on keys with configured keycodes:
|
||||
```c
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
if (get_highest_layer(layer_state) > 0) {
|
||||
uint8_t layer = get_highest_layer(layer_state);
|
||||
|
||||
@ -951,6 +958,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
||||
@ -961,7 +969,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
This example sets the modifiers to be a specific color based on the layer state. You can use a switch case here, instead, if you would like. This uses HSV and then converts to RGB, because this allows the brightness to be limited (important when using the WS2812 driver).
|
||||
|
||||
```c
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
HSV hsv = {0, 255, 255};
|
||||
|
||||
if (layer_state_is(layer_state, 2)) {
|
||||
@ -980,18 +988,20 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
||||
If you want to indicate a Host LED status (caps lock, num lock, etc), you can use something like this to light up the caps lock key:
|
||||
|
||||
```c
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR(5, 255, 255, 255); // assuming caps lock is at led #5
|
||||
} else {
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR(5, 0, 0, 0);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
||||
|
@ -114,7 +114,11 @@ led_config_t g_led_config = {
|
||||
}
|
||||
};
|
||||
|
||||
__attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
|
||||
if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (host_keyboard_led_state().caps_lock && CAPS_LOCK_ENABLE) {
|
||||
for (uint8_t i = led_min; i <= led_max; i++) {
|
||||
if (g_led_config.flags[i] & CAPS_LED_GROUP) {
|
||||
@ -122,5 +126,7 @@ __attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
@ -32,7 +32,10 @@ led_config_t g_led_config = {{
|
||||
LED_FLAG_INDICATOR, LED_FLAG_INDICATOR
|
||||
}};
|
||||
|
||||
void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
|
||||
if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
|
||||
return false;
|
||||
}
|
||||
if (!host_keyboard_led_state().caps_lock) {
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR(0, 0, 0, 0);
|
||||
}
|
||||
@ -40,5 +43,5 @@ void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR(1, 0, 0, 0);
|
||||
}
|
||||
|
||||
rgb_matrix_indicators_advanced_user(led_min, led_max);
|
||||
return true;
|
||||
}
|
||||
|
@ -68,7 +68,7 @@ void keyboard_post_init_user(void) {
|
||||
};
|
||||
|
||||
// Custom RGB indicator behaviour:
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
uint8_t led_processed_count = 0;
|
||||
for (uint8_t row = 0; row < MATRIX_ROWS; ++row) {
|
||||
for (uint8_t col = 0; col < MATRIX_COLS; ++col) {
|
||||
@ -115,10 +115,11 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -21,20 +21,20 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
|
||||
{ 0, B_1, A_1, C_1 },
|
||||
{ 0, B_2, A_2, C_2 },
|
||||
{ 0, B_3, A_3, C_3 },
|
||||
{ 0, B_4, A_4, C_4 },
|
||||
{ 0, B_5, A_5, C_5 },
|
||||
{ 0, B_6, A_6, C_6 },
|
||||
{ 0, B_7, A_7, C_7 },
|
||||
{ 0, B_8, A_8, C_8 },
|
||||
{ 0, B_9, A_9, C_9 },
|
||||
{ 0, B_10, A_10, C_10 },
|
||||
{ 0, B_11, A_11, C_11 },
|
||||
{ 0, B_12, A_12, C_12 },
|
||||
{ 0, B_13, A_13, C_13 },
|
||||
{ 0, B_4, A_4, C_4 },
|
||||
{ 0, B_5, A_5, C_5 },
|
||||
{ 0, B_6, A_6, C_6 },
|
||||
{ 0, B_7, A_7, C_7 },
|
||||
{ 0, B_8, A_8, C_8 },
|
||||
{ 0, B_9, A_9, C_9 },
|
||||
{ 0, B_10, A_10, C_10 },
|
||||
{ 0, B_11, A_11, C_11 },
|
||||
{ 0, B_12, A_12, C_12 },
|
||||
{ 0, B_13, A_13, C_13 },
|
||||
{ 0, B_14, A_14, C_14 },
|
||||
{ 0, B_15, A_15, C_15 },
|
||||
|
||||
{ 0, E_1, D_1, F_1 },
|
||||
|
||||
{ 0, E_1, D_1, F_1 },
|
||||
{ 0, E_2, D_2, F_2 },
|
||||
{ 0, E_3, D_3, F_3 },
|
||||
{ 0, E_4, D_4, F_4 },
|
||||
@ -46,13 +46,13 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
|
||||
{ 0, E_10, D_10, F_10 },
|
||||
{ 0, E_11, D_11, F_11 },
|
||||
{ 0, E_12, D_12, F_12 },
|
||||
{ 0, E_13, D_13, F_13 },
|
||||
{ 0, E_14, D_14, F_14 },
|
||||
{ 0, E_13, D_13, F_13 },
|
||||
{ 0, E_14, D_14, F_14 },
|
||||
{ 0, E_15, D_15, F_15 },
|
||||
|
||||
{ 0, H_1, G_1, I_1 },
|
||||
{ 0, H_2, G_2, I_2 },
|
||||
{ 0, H_3, G_3, I_3 },
|
||||
|
||||
{ 0, H_1, G_1, I_1 },
|
||||
{ 0, H_2, G_2, I_2 },
|
||||
{ 0, H_3, G_3, I_3 },
|
||||
{ 0, H_4, G_4, I_4 },
|
||||
{ 0, H_5, G_5, I_5 },
|
||||
{ 0, H_6, G_6, I_6 },
|
||||
@ -67,25 +67,25 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
|
||||
|
||||
{ 0, K_2, J_2, L_2 },
|
||||
{ 0, K_3, J_3, L_3 },
|
||||
{ 0, K_4, J_4, L_4 },
|
||||
{ 0, K_4, J_4, L_4 },
|
||||
{ 0, K_5, J_5, L_5 },
|
||||
{ 0, K_6, J_6, L_6 },
|
||||
{ 0, K_7, J_7, L_7 },
|
||||
{ 0, K_8, J_8, L_8 },
|
||||
{ 0, K_9, J_9, L_9 },
|
||||
{ 0, K_7, J_7, L_7 },
|
||||
{ 0, K_8, J_8, L_8 },
|
||||
{ 0, K_9, J_9, L_9 },
|
||||
{ 0, K_10, J_10, L_10 },
|
||||
{ 0, K_11, J_11, L_11 },
|
||||
{ 0, K_12, J_12, L_12 },
|
||||
{ 0, K_13, J_13, L_13 },
|
||||
{ 0, K_11, J_11, L_11 },
|
||||
{ 0, K_12, J_12, L_12 },
|
||||
{ 0, K_13, J_13, L_13 },
|
||||
{ 0, K_14, J_14, L_14 },
|
||||
|
||||
{ 0, K_1, J_1, L_1 },
|
||||
{ 0, K_16, J_16, L_16 },
|
||||
{ 0, H_16, G_16, I_16 },
|
||||
{ 0, E_16, D_16, F_16 },
|
||||
{ 0, B_16, A_16, C_16 },
|
||||
{ 0, E_16, D_16, F_16 },
|
||||
{ 0, B_16, A_16, C_16 },
|
||||
{ 0, H_15, G_15, I_15 },
|
||||
{ 0, K_15, J_15, L_15 },
|
||||
{ 0, K_15, J_15, L_15 },
|
||||
};
|
||||
|
||||
led_config_t g_led_config = {
|
||||
@ -102,7 +102,7 @@ led_config_t g_led_config = {
|
||||
{16,48},{32,48},{48,48},{64,48},{80,48},{96,48},{112,48},{128,48},{144,48},{160,48},{176,48},{192,48},{224,48},
|
||||
{16,64},{48,64},{80,64},{96,64},{128,64},{160,64},{224,64}
|
||||
}, {
|
||||
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
|
||||
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
|
||||
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
|
||||
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
|
||||
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
|
||||
@ -110,9 +110,12 @@ led_config_t g_led_config = {
|
||||
}
|
||||
};
|
||||
#endif
|
||||
__attribute__ ((weak))
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_kb(void) {
|
||||
if (!rgb_matrix_indicators_user()) {
|
||||
return false;
|
||||
}
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(31, 0xFF, 0xFF, 0xFF);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
}
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
if (rgb_matrix_is_enabled()) { // turn the lights on when it is enabled.
|
||||
uint8_t layer = get_highest_layer(layer_state);
|
||||
switch (layer) {
|
||||
@ -250,5 +250,6 @@ void rgb_matrix_indicators_user(void) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
}
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
if (rgb_matrix_is_enabled()) { // turn the lights on when it is enabled.
|
||||
uint8_t layer = biton32(layer_state);
|
||||
switch (layer) {
|
||||
@ -250,5 +250,6 @@ void rgb_matrix_indicators_user(void) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
@ -141,7 +141,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
}
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
if (rgb_matrix_is_enabled()) { // turn the lights on when it is enabled.
|
||||
uint8_t layer = get_highest_layer(layer_state);
|
||||
switch (layer) {
|
||||
@ -177,5 +177,6 @@ void rgb_matrix_indicators_user(void) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
@ -19,17 +19,17 @@
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
/* Base */
|
||||
[_QWERTY] = LAYOUT_all(
|
||||
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_MPLY,
|
||||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN,
|
||||
KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT,
|
||||
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
|
||||
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_MPLY,
|
||||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN,
|
||||
KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT,
|
||||
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
|
||||
KC_LCTL, KC_LGUI, KC_LALT, LT_SPCF, LT_SPCF, LT_SPCF, TD_TWIN, MO(_FN2_60), KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
|
||||
),
|
||||
[_DEFAULT] = LAYOUT_all(
|
||||
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_MPLY,
|
||||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN,
|
||||
KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT,
|
||||
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
|
||||
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_MPLY,
|
||||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, CA_SCLN,
|
||||
KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT,
|
||||
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
|
||||
KC_LCTL, KC_LGUI, KC_LALT, LT_SPCF, LT_SPCF, LT_SPCF, TD_TWIN, MO(_FN2_60), KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
|
||||
),
|
||||
[_FN1_60] = LAYOUT_all(
|
||||
@ -43,24 +43,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG(_DEFAULT)
|
||||
)
|
||||
|
||||
};
|
||||
|
||||
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
uint8_t layer = get_highest_layer(layer_state);
|
||||
switch (layer) {
|
||||
case _FN1_60:
|
||||
rgb_matrix_set_color(10, 0, 0, 255);
|
||||
rgb_matrix_set_color(10, 0, 0, 255);
|
||||
break;
|
||||
case _FN2_60:
|
||||
rgb_matrix_set_color(10, 255, 255, 255);
|
||||
rgb_matrix_set_color(10, 255, 255, 255);
|
||||
break;
|
||||
case _DEFAULT:
|
||||
rgb_matrix_set_color(10, 0, 255, 0);
|
||||
rgb_matrix_set_color(10, 0, 255, 0);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@ -68,6 +68,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(10, 255, 0, 0);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void matrix_init_kb(void){
|
||||
|
@ -108,10 +108,13 @@ led_config_t g_led_config = {
|
||||
}
|
||||
};
|
||||
|
||||
__attribute__ ((weak))
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_kb(void) {
|
||||
if (!rgb_matrix_indicators_user()) {
|
||||
return false;
|
||||
}
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
@ -25,13 +25,17 @@ void matrix_init_kb(void) {
|
||||
}
|
||||
|
||||
/* Set LED 62 (Caps Lock) and LED 14 (Scroll Lock) when key active */
|
||||
void rgb_matrix_indicators_kb(void) {
|
||||
bool rgb_matrix_indicators_kb(void) {
|
||||
if (!rgb_matrix_indicators_user()) {
|
||||
return false;
|
||||
}
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(62, 255, 255, 255);
|
||||
}
|
||||
if (host_keyboard_led_state().scroll_lock) {
|
||||
rgb_matrix_set_color(14, 255, 255, 255);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Leds on the CU80 go ltr > rtl > ltr > rlt > Ltr > rtl */
|
||||
|
@ -24,13 +24,17 @@ void matrix_init_kb(void) {
|
||||
}
|
||||
|
||||
/* Set LED 62 (Caps Lock) and LED 14 (Scroll Lock) when key active */
|
||||
void rgb_matrix_indicators_kb(void) {
|
||||
bool rgb_matrix_indicators_kb(void) {
|
||||
if (!rgb_matrix_indicators_user()) {
|
||||
return false;
|
||||
}
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(62, 255, 255, 255);
|
||||
}
|
||||
if (host_keyboard_led_state().scroll_lock) {
|
||||
rgb_matrix_set_color(14, 255, 255, 255);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Leds on the CU80 go ltr > rtl > ltr > rlt > Ltr > rtl */
|
||||
|
@ -48,13 +48,16 @@ led_config_t g_led_config = { {
|
||||
|
||||
} };
|
||||
|
||||
__attribute__ ((weak))
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_kb(void) {
|
||||
if (!rgb_matrix_indicators_user()) {
|
||||
return false;
|
||||
}
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(51, 255, 255, 255);
|
||||
}
|
||||
if (host_keyboard_led_state().scroll_lock) {
|
||||
rgb_matrix_set_color(14, 255, 255, 255);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
@ -591,7 +591,7 @@ void set_led_scale_indicator(uint8_t r, uint8_t g, uint8_t b) {
|
||||
}
|
||||
}
|
||||
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
// uint32_t mode = rgblight_get_mode();
|
||||
|
||||
if (rgb_matrix_is_enabled()) { // turn the lights on when it is enabled.
|
||||
@ -691,5 +691,6 @@ void rgb_matrix_indicators_user(void) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
|
@ -594,7 +594,7 @@ void set_led_scale_indicator(uint8_t r, uint8_t g, uint8_t b) {
|
||||
}
|
||||
}
|
||||
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
// uint32_t mode = rgblight_get_mode();
|
||||
|
||||
if (rgb_matrix_is_enabled()) { // turn the lights on when it is enabled.
|
||||
@ -694,5 +694,6 @@ void rgb_matrix_indicators_user(void) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
|
@ -245,7 +245,7 @@ void set_led_scale_indicator(uint8_t r, uint8_t g, uint8_t b) {
|
||||
}
|
||||
}
|
||||
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
// uint32_t mode = rgblight_get_mode();
|
||||
|
||||
if (rgb_matrix_is_enabled()) { // turn the lights on when it is enabled.
|
||||
@ -280,5 +280,6 @@ void rgb_matrix_indicators_user(void) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
|
@ -8,10 +8,10 @@
|
||||
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
|
||||
// Layer names don't all need to be of the same length, obviously, and you can also skip them
|
||||
// entirely and just use numbers.
|
||||
enum layers {
|
||||
_QWERTY,
|
||||
_LOWER,
|
||||
_RAISE,
|
||||
enum layers {
|
||||
_QWERTY,
|
||||
_LOWER,
|
||||
_RAISE,
|
||||
_NUMP,
|
||||
};
|
||||
|
||||
@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[_QWERTY] = LAYOUT
|
||||
)};
|
||||
|
||||
//Per key lights
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case _QWERTY:
|
||||
@ -179,7 +179,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
case 15: // C key off
|
||||
case 20: // X key off
|
||||
case 21: // Z key off
|
||||
|
||||
|
||||
case 26: // shift key off
|
||||
case 52 ... 53: // right column off
|
||||
rgb_matrix_set_color(i, 0, 0, 0); // off
|
||||
@ -256,6 +256,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
rgb_matrix_set_color(14, 0, 255, 0); // Green layer active
|
||||
}
|
||||
}
|
||||
return false;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
@ -29,12 +29,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
// https://github.com/foostan/crkbd/blob/main/corne-classic/doc/buildguide_en.md
|
||||
|
||||
// Change LED color to red when CAPS LOCK is active
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(26, 255, 0, 0);
|
||||
// Only works with SPLIT_LED_STATE_ENABLE
|
||||
rgb_matrix_set_color(53, 255, 0, 0);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// + ---- +
|
||||
@ -128,4 +129,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
_______, _______, _______, _______, _______, _______
|
||||
//|--------------------------| |--------------------------|
|
||||
)
|
||||
};
|
||||
};
|
||||
|
@ -342,7 +342,7 @@ void check_default_layer(uint8_t type) {
|
||||
}
|
||||
}
|
||||
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
if (
|
||||
user_config.rgb_layer_change && rgb_matrix_config.enable &&
|
||||
(!user_config.rgb_matrix_idle_anim || rgb_matrix_get_mode() != user_config.rgb_matrix_idle_mode)
|
||||
@ -370,6 +370,7 @@ void rgb_matrix_indicators_user(void) {
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void rgb_matrix_update_current_mode(uint8_t mode, uint8_t speed) {
|
||||
|
@ -24,7 +24,7 @@ static const char nav_leds[] = {38, 43, 44, 46};
|
||||
static const char fun_leds[] = {45, 44, 37, 46, 43, 38, 47, 42, 39, 40};
|
||||
static const char mouse_leds[] = {11, 16, 17, 19};
|
||||
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(26, RGB_RED);
|
||||
}
|
||||
@ -65,4 +65,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
break;
|
||||
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -45,8 +45,9 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
|
||||
};
|
||||
#endif
|
||||
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(62, RGB_WHITE);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -107,7 +107,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
return true;
|
||||
};
|
||||
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(62, RGB_WHITE);
|
||||
} else if ((rgb_matrix_get_flags() & (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR)) == 0) {
|
||||
@ -133,4 +133,5 @@ void rgb_matrix_indicators_user(void) {
|
||||
rgb_matrix_set_color(55, RGB_OFF);
|
||||
rgb_matrix_set_color(59, RGB_OFF);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -52,23 +52,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
),
|
||||
};
|
||||
|
||||
void rgb_matrix_indicators_user(void)
|
||||
{
|
||||
if (host_keyboard_led_state().caps_lock)
|
||||
{
|
||||
rgb_matrix_set_color(22, 200, 200, 200);
|
||||
}
|
||||
if (IS_LAYER_ON(_L1))
|
||||
{
|
||||
rgb_matrix_set_color(35, 0, 200, 200);
|
||||
}
|
||||
if (IS_LAYER_ON(_L2))
|
||||
{
|
||||
rgb_matrix_set_color(22, 200, 0, 200);
|
||||
}
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(22, 200, 200, 200);
|
||||
}
|
||||
if (IS_LAYER_ON(_L1)) {
|
||||
rgb_matrix_set_color(35, 0, 200, 200);
|
||||
}
|
||||
if (IS_LAYER_ON(_L2)) {
|
||||
rgb_matrix_set_color(22, 200, 0, 200);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void keyboard_pre_init_user(void) {
|
||||
setPinOutput(B5);
|
||||
writePinLow(B5);
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright 2021 Jessica Sullivan and Don Kjer
|
||||
/* Copyright 2021 Jessica Sullivan and Don Kjer
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -60,14 +60,14 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
|
||||
__attribute__ ((weak))
|
||||
void rgb_matrix_indicators_user(void)
|
||||
{
|
||||
if (host_keyboard_led_state().caps_lock)
|
||||
{
|
||||
bool rgb_matrix_indicators_kb(void) {
|
||||
if (!rgb_matrix_indicators_user()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(CAPS_LED, 0xFF, 0xFF, 0xFF);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#endif /* RGB_MATRIX_ENABLE */
|
||||
|
||||
|
||||
|
@ -93,20 +93,13 @@ led_config_t g_led_config = {
|
||||
}
|
||||
};
|
||||
|
||||
void suspend_power_down_kb(void) {
|
||||
rgb_matrix_set_suspend_state(true);
|
||||
suspend_power_down_user();
|
||||
}
|
||||
|
||||
void suspend_wakeup_init_kb(void) {
|
||||
rgb_matrix_set_suspend_state(false);
|
||||
suspend_wakeup_init_user();
|
||||
}
|
||||
|
||||
__attribute__ ((weak))
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
bool rgb_matrix_indicators_kb(void) {
|
||||
if (!rgb_matrix_indicators_user()) {
|
||||
return false;
|
||||
}
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
@ -91,8 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
*/
|
||||
};
|
||||
|
||||
void rgb_matrix_indicators_user(void)
|
||||
{
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
uint8_t this_led = host_keyboard_leds();
|
||||
|
||||
if (!g_suspend_state && rgb_matrix_config.enable) {
|
||||
@ -218,6 +217,7 @@ void rgb_matrix_indicators_user(void)
|
||||
if (this_led & (1 << USB_LED_CAPS_LOCK)) {
|
||||
rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void matrix_init_user(void)
|
||||
|
@ -57,8 +57,7 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
|
||||
}
|
||||
}
|
||||
|
||||
void rgb_matrix_indicators_user(void)
|
||||
{
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
uint8_t this_led = host_keyboard_leds();
|
||||
|
||||
if (!g_suspend_state && rgb_matrix_config.enable) {
|
||||
@ -151,6 +150,7 @@ void rgb_matrix_indicators_user(void)
|
||||
rgb_matrix_set_color(62, 0x00, 0x00, 0x00);
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
@ -34,8 +34,7 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
|
||||
}
|
||||
}
|
||||
|
||||
void rgb_matrix_indicators_user(void)
|
||||
{
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
if (!g_suspend_state) {
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case _QWERTY:
|
||||
@ -113,6 +112,7 @@ void rgb_matrix_indicators_user(void)
|
||||
rgb_matrix_set_color(62, 0x00, 0x00, 0x00);
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
@ -157,7 +157,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
return true;
|
||||
};
|
||||
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
led_t led_state = host_keyboard_led_state();
|
||||
|
||||
if (led_state.caps_lock) {
|
||||
@ -227,4 +227,5 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR(25, 0x33, 0x66, 0x99);
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR(26, 0x33, 0x66, 0x99);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user