sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Per Key LED Indicator Callbacks (#18450)

Browse Source 
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
Drashna Jaelre
2022-10-04 15:24:22 -07:00
committed by GitHub
parent 09d3e27710
commit 64b1ed4550
218 changed files with 1430 additions and 1271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
View File

@@ -266,19 +266,19 @@ void set_led_color_by_hsv(int ledkey, uint8_t h_in, uint8_t s_in, uint8_t v_in){
void set_led_color_by_layer(int layer, int ledkey){
set_led_color_by_hsv(ledkey, pgm_read_byte(&ledmap[layer][0]),
pgm_read_byte(&ledmap[layer][1]),
pgm_read_byte(&ledmap[layer][2]));
pgm_read_byte(&ledmap[layer][2]));
}
void set_ledkey_by_layer_type(int layer, int ledkey, uint16_t key){
if (rgb_matrix_get_flags() != LED_FLAG_ALL){
if ( key == KC_TRNS ) {
if ((pgm_read_byte(&ledmap[layer][3]) == LYR_TRANS) && (layer > 0)){
// this key is transparent and the layer below does something
// this key is transparent and the layer below does something
// - light it up in (lower) layer-1 specific color
set_led_color_by_layer(layer-1, ledkey);
}
set_led_color_by_layer(layer-1, ledkey);
}
if (pgm_read_byte(&ledmap[layer][3]) == LYR_BLACK){
// this key is transparent but the lower layer is not intended
// this key is transparent but the lower layer is not intended
// to be used, it still works but not intended; type BLACK
set_led_color_by_hsv(ledkey, HSV_BLACK);
}
@@ -300,7 +300,7 @@ void set_caps_lock(int layer) {
// it might be used for displaying led pattern
if((rgb_matrix_get_flags() != LED_FLAG_ALL)) {
// or to keep the correct lighting on for the layer that use all keys
// on all other layers turn the led off, so only switch it of when
// on all other layers turn the led off, so only switch it of when
// layer is BLACK
if(pgm_read_byte(&ledmap[layer][3]) == LYR_BLACK){
set_led_color_by_hsv(caps_lock_led, HSV_BLACK);
@@ -316,14 +316,14 @@ void set_layer_color(int layer) {
uint8_t row = keyindex/MATRIX_COLS;
uint8_t col = (keyindex-(keyindex/MATRIX_COLS)*MATRIX_COLS);
uint16_t key=pgm_read_word(&keymaps[layer][row][col]);
// continue if this is not a valid key
if (key==KC_NO) { continue; }
// handle layer specific coloring
set_ledkey_by_layer_type(layer, ledkey, key);
/* === below this function add custom overriding ledkey lighting === */
// gaming layer with highlighted keys
//if (IS_LAYER_ON(_LVL4_)) {
if (layer == _LVL4_) {
@@ -439,10 +439,11 @@ void set_layer_color(int layer) {
return;
}
void rgb_matrix_indicators_user(void) {
bool rgb_matrix_indicators_user(void) {
int layer = get_highest_layer(layer_state);
set_layer_color(layer);
set_caps_lock(layer);
return false;
}
#ifdef LEADER_ENABLE