jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues with RGB Matrix flags (#353)

Browse Source
This commit is contained in:
Drashna Jaelre
2022-07-12 16:36:17 -07:00
committed by GitHub
parent 085f0898e0
commit 764ac89d8d
7 changed files with 9 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
keyboards/ergodox_ez/ergodox_ez.c
View File

@@ -67,14 +67,6 @@ void matrix_init_kb(void) {
keyboard_config.raw = eeconfig_read_kb(); keyboard_config.raw = eeconfig_read_kb();
ergodox_led_all_set((uint8_t)keyboard_config.led_level * 255 / 4); ergodox_led_all_set((uint8_t)keyboard_config.led_level * 255 / 4);
#ifdef RGB_MATRIX_ENABLE
if (keyboard_config.rgb_matrix_enable) {
rgb_matrix_set_flags(LED_FLAG_ALL);
} else {
rgb_matrix_set_flags(LED_FLAG_NONE);
}
#endif
ergodox_blink_all_leds(); ergodox_blink_all_leds();
matrix_init_user(); matrix_init_user();
@@ -376,15 +368,12 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
switch (rgb_matrix_get_flags()) { switch (rgb_matrix_get_flags()) {
case LED_FLAG_ALL: { case LED_FLAG_ALL: {
rgb_matrix_set_flags(LED_FLAG_NONE); rgb_matrix_set_flags(LED_FLAG_NONE);
keyboard_config.rgb_matrix_enable = false;
rgb_matrix_set_color_all(0, 0, 0); rgb_matrix_set_color_all(0, 0, 0);
} break; } break;
default: { default: {
rgb_matrix_set_flags(LED_FLAG_ALL); rgb_matrix_set_flags(LED_FLAG_ALL);
keyboard_config.rgb_matrix_enable = true;
} break; } break;
} }
eeconfig_update_kb(keyboard_config.raw);
} }
return false; return false;
# endif # endif
@@ -396,7 +385,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
void eeconfig_init_kb(void) { // EEPROM is getting reset! void eeconfig_init_kb(void) { // EEPROM is getting reset!
keyboard_config.raw = 0; keyboard_config.raw = 0;
keyboard_config.led_level = 4; keyboard_config.led_level = 4;
keyboard_config.rgb_matrix_enable = true;
eeconfig_update_kb(keyboard_config.raw); eeconfig_update_kb(keyboard_config.raw);
eeconfig_init_user(); eeconfig_init_user();
} }

2
keyboards/ergodox_ez/ergodox_ez.h
View File

@@ -137,7 +137,7 @@ typedef union {
struct { struct {
uint8_t led_level :3; uint8_t led_level :3;
bool disable_layer_led :1; bool disable_layer_led :1;
bool rgb_matrix_enable :1; bool placeholder :1;
}; };
} keyboard_config_t; } keyboard_config_t;

12
keyboards/moonlander/moonlander.c
View File

@@ -407,7 +407,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {
keyboard_config.disable_layer_led ^= 1; keyboard_config.disable_layer_led ^= 1;
if (keyboard_config.disable_layer_led) rgb_matrix_set_color_all(0, 0, 0); if (keyboard_config.disable_layer_led) rgb_matrix_set_color_all(0, 0, 0);
eeconfig_update_kb(keyboard_config.raw);
} }
break; break;
case RGB_TOG: case RGB_TOG:
@@ -415,15 +414,12 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
switch (rgb_matrix_get_flags()) { switch (rgb_matrix_get_flags()) {
case LED_FLAG_ALL: { case LED_FLAG_ALL: {
rgb_matrix_set_flags(LED_FLAG_NONE); rgb_matrix_set_flags(LED_FLAG_NONE);
keyboard_config.rgb_matrix_enable = false;
rgb_matrix_set_color_all(0, 0, 0); rgb_matrix_set_color_all(0, 0, 0);
} break; } break;
default: { default: {
rgb_matrix_set_flags(LED_FLAG_ALL); rgb_matrix_set_flags(LED_FLAG_ALL);
keyboard_config.rgb_matrix_enable = true;
} break; } break;
} }
eeconfig_update_kb(keyboard_config.raw);
} }
return false; return false;
#endif #endif
@@ -439,19 +435,11 @@ void matrix_init_kb(void) {
keyboard_config.led_level_res = 0b11; keyboard_config.led_level_res = 0b11;
eeconfig_update_kb(keyboard_config.raw); eeconfig_update_kb(keyboard_config.raw);
} }
#ifdef RGB_MATRIX_ENABLE
if (keyboard_config.rgb_matrix_enable) {
rgb_matrix_set_flags(LED_FLAG_ALL);
} else {
rgb_matrix_set_flags(LED_FLAG_NONE);
}
#endif
matrix_init_user(); matrix_init_user();
} }
void eeconfig_init_kb(void) { // EEPROM is getting reset! void eeconfig_init_kb(void) { // EEPROM is getting reset!
keyboard_config.raw = 0; keyboard_config.raw = 0;
keyboard_config.rgb_matrix_enable = true;
keyboard_config.led_level = true; keyboard_config.led_level = true;
keyboard_config.led_level_res = 0b11; keyboard_config.led_level_res = 0b11;
eeconfig_update_kb(keyboard_config.raw); eeconfig_update_kb(keyboard_config.raw);

2
keyboards/moonlander/moonlander.h
View File

@@ -70,7 +70,7 @@ typedef union {
uint32_t raw; uint32_t raw;
struct { struct {
bool disable_layer_led :1; bool disable_layer_led :1;
bool rgb_matrix_enable :1; bool placeholder :1;
bool led_level :1; bool led_level :1;
uint8_t led_level_res :2; // DO NOT REMOVE uint8_t led_level_res :2; // DO NOT REMOVE
}; };

11
keyboards/planck/ez/ez.c
View File

@@ -208,20 +208,12 @@ void keyboard_pre_init_kb(void) {
} }
// read kb settings from eeprom // read kb settings from eeprom
keyboard_config.raw = eeconfig_read_kb(); keyboard_config.raw = eeconfig_read_kb();
#ifdef RGB_MATRIX_ENABLE
if (keyboard_config.rgb_matrix_enable) {
rgb_matrix_set_flags(LED_FLAG_ALL);
} else {
rgb_matrix_set_flags(LED_FLAG_NONE);
}
#endif
led_initialize_hardware(); led_initialize_hardware();
keyboard_pre_init_user(); keyboard_pre_init_user();
} }
void eeconfig_init_kb(void) { // EEPROM is getting reset! void eeconfig_init_kb(void) { // EEPROM is getting reset!
keyboard_config.raw = 0; keyboard_config.raw = 0;
keyboard_config.rgb_matrix_enable = true;
keyboard_config.led_level = 4; keyboard_config.led_level = 4;
eeconfig_update_kb(keyboard_config.raw); eeconfig_update_kb(keyboard_config.raw);
eeconfig_init_user(); eeconfig_init_user();
@@ -277,17 +269,14 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
switch (rgb_matrix_get_flags()) { switch (rgb_matrix_get_flags()) {
case LED_FLAG_ALL: { case LED_FLAG_ALL: {
rgb_matrix_set_flags(LED_FLAG_NONE); rgb_matrix_set_flags(LED_FLAG_NONE);
keyboard_config.rgb_matrix_enable = false;
rgb_matrix_set_color_all(0, 0, 0); rgb_matrix_set_color_all(0, 0, 0);
} }
break; break;
default: { default: {
rgb_matrix_set_flags(LED_FLAG_ALL); rgb_matrix_set_flags(LED_FLAG_ALL);
keyboard_config.rgb_matrix_enable = true;
} }
break; break;
} }
eeconfig_update_kb(keyboard_config.raw);
} }
return false; return false;
#endif #endif

2
keyboards/planck/ez/ez.h
View File

@@ -78,7 +78,7 @@ typedef union {
struct { struct {
uint8_t led_level :3; uint8_t led_level :3;
bool disable_layer_led :1; bool disable_layer_led :1;
bool rgb_matrix_enable :1; bool placeholder :1;
}; };
} keyboard_config_t; } keyboard_config_t;

7
quantum/rgb_matrix/rgb_matrix.c
View File

@@ -724,10 +724,15 @@ void rgb_matrix_decrease_speed(void) {
rgb_matrix_decrease_speed_helper(true); rgb_matrix_decrease_speed_helper(true);
} }
void rgb_matrix_set_flags_eeprom_helper(led_flags_t flags, bool write_to_eeprom) {
rgb_matrix_config.flags = flags;
eeconfig_flag_rgb_matrix(write_to_eeprom);
dprintf("rgb matrix set speed [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", rgb_matrix_config.flags);
}
led_flags_t rgb_matrix_get_flags(void) { led_flags_t rgb_matrix_get_flags(void) {
return rgb_matrix_config.flags; return rgb_matrix_config.flags;
} }
void rgb_matrix_set_flags(led_flags_t flags) { void rgb_matrix_set_flags(led_flags_t flags) {
rgb_matrix_config.flags = flags; rgb_matrix_set_flags_eeprom_helper(flags, true);
} }