forked from mirrors/qmk_userspace
refactor: move default RGB/LED matrix #defines (#21938)
* refactor: move default RGB/LED matrix #defines Moving the fallback definitions of macros like LED_MATRIX_VAL_STEP and RGB_MATRIX_MAXIMUM_BRIGHTNESS to header files allows keyboards to leverage these defaults without requiring #ifdef guards (and often repeating said fallback definitions). * style: use if(n)def for consistency and remove redundant UINT8_MAX checks on maximum brightness Co-authored-by: Joel Challis <git@zvecr.com> * refactor: remove INDICATOR_MAX_BRIGHTNESS macro Co-authored-by: Joel Challis <git@zvecr.com> --------- Co-authored-by: Joel Challis <git@zvecr.com>
This commit is contained in:
parent
f4677c866e
commit
346b06d391
18 changed files with 103 additions and 138 deletions
|
@ -117,9 +117,6 @@ void matrix_init_kb(void) {
|
|||
* Since K20x is stuck with a 32 byte EEPROM (see tmk_core/common/chibios/eeprom_teensy.c),
|
||||
* and neither led_matrix_eeconfig.speed or .flags fit in this boundary, just force their values to default on boot.
|
||||
*/
|
||||
# if !defined(LED_MATRIX_DEFAULT_SPD)
|
||||
# define LED_MATRIX_DEFAULT_SPD UINT8_MAX / 2
|
||||
# endif
|
||||
led_matrix_set_speed(LED_MATRIX_DEFAULT_SPD);
|
||||
led_matrix_set_flags(LED_FLAG_ALL);
|
||||
#endif
|
||||
|
|
|
@ -217,9 +217,6 @@ void matrix_init_kb(void) {
|
|||
* Since K20x is stuck with a 32 byte EEPROM (see tmk_core/common/chibios/eeprom_teensy.c),
|
||||
* and neither led_matrix_eeconfig.speed or .flags fit in this boundary, just force their values to default on boot.
|
||||
*/
|
||||
# if !defined(RGB_MATRIX_DEFAULT_SPD)
|
||||
# define RGB_MATRIX_DEFAULT_SPD UINT8_MAX / 2
|
||||
# endif
|
||||
rgb_matrix_set_speed(RGB_MATRIX_DEFAULT_SPD),
|
||||
rgb_matrix_set_flags(LED_FLAG_ALL);
|
||||
|
||||
|
|
|
@ -83,9 +83,6 @@ void matrix_init_kb(void) {
|
|||
* Since K20x is stuck with a 32 byte EEPROM (see tmk_core/common/chibios/eeprom_teensy.c),
|
||||
* and neither led_matrix_eeconfig.speed or .flags fit in this boundary, just force their values to default on boot.
|
||||
*/
|
||||
# if !defined(LED_MATRIX_DEFAULT_SPD)
|
||||
# define LED_MATRIX_DEFAULT_SPD UINT8_MAX / 2
|
||||
# endif
|
||||
led_matrix_set_speed(LED_MATRIX_DEFAULT_SPD),
|
||||
led_matrix_set_flags(LED_FLAG_ALL);
|
||||
#endif
|
||||
|
|
|
@ -5,7 +5,8 @@
|
|||
"device_version": "0.0.3"
|
||||
},
|
||||
"rgb_matrix": {
|
||||
"driver": "is31fl3741"
|
||||
"driver": "is31fl3741",
|
||||
"val_steps": 8
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
|
||||
|
|
|
@ -125,16 +125,12 @@ led_config_t g_led_config = { {
|
|||
|
||||
#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
|
||||
|
||||
#ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
#if !defined(CAPS_LOCK_MAX_BRIGHTNESS)
|
||||
#define CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
#else
|
||||
#define CAPS_LOCK_MAX_BRIGHTNESS 0xFF
|
||||
#endif
|
||||
|
||||
#ifdef RGB_MATRIX_VAL_STEP
|
||||
#if !defined(CAPS_LOCK_VAL_STEP)
|
||||
#define CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
|
||||
#else
|
||||
#define CAPS_LOCK_VAL_STEP 8
|
||||
#endif
|
||||
|
||||
bool rgb_matrix_indicators_kb(void) {
|
||||
|
|
|
@ -53,11 +53,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
/* RGB matrix indicator code
|
||||
It reads the current matrix color, offsets the hue by 30,
|
||||
and sets val to either 255 or, if defined, RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
and sets val to RGB_MATRIX_MAXIMUM_BRIGHTNESS (by default, 255)
|
||||
This is applied to both caps lock, and other indicator keys for layer 1 */
|
||||
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,INDICATOR_MAX_BRIGHTNESS};
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,RGB_MATRIX_MAXIMUM_BRIGHTNESS};
|
||||
RGB rgb_ind = hsv_to_rgb(hsv_ind);
|
||||
|
||||
/* Sets Caps to different color as indicator. If RGB mode is rain, and caps indicator is off, the LED will always be off.
|
||||
|
@ -70,7 +70,7 @@ bool rgb_matrix_indicators_user(void) {
|
|||
|
||||
/* Sets W, A, S, D, LGUI to a different color as layer indicator */
|
||||
if(IS_LAYER_ON(1)) {
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,INDICATOR_MAX_BRIGHTNESS};
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,RGB_MATRIX_MAXIMUM_BRIGHTNESS};
|
||||
RGB rgb_ind = hsv_to_rgb(hsv_ind);
|
||||
|
||||
rgb_matrix_set_color(W_LED_INDEX, rgb_ind.r, rgb_ind.g, rgb_ind.b);
|
||||
|
|
|
@ -144,13 +144,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
/* RGB matrix indicator code
|
||||
It reads the current matrix color, offsets the hue by 30,
|
||||
and sets val to either 255 or, if defined, RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
and sets val to RGB_MATRIX_MAXIMUM_BRIGHTNESS (by default, 255)
|
||||
This is applied to both caps lock, and other indicator keys for layer 1 */
|
||||
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
/* Layer 2 (perf mode on this keymap) is not supposed to have LED refreshes, hence excluded */
|
||||
if (!IS_LAYER_ON(2)) {
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,INDICATOR_MAX_BRIGHTNESS};
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,RGB_MATRIX_MAXIMUM_BRIGHTNESS};
|
||||
RGB rgb_ind = hsv_to_rgb(hsv_ind);
|
||||
|
||||
/* Sets Caps to different color as indicator. If RGB mode is rain, and caps indicator is off, the LED will always be off.
|
||||
|
@ -163,7 +163,7 @@ bool rgb_matrix_indicators_user(void) {
|
|||
|
||||
/* Sets W, A, S, D, LGUI to a different color as layer indicator */
|
||||
if(IS_LAYER_ON(1)) {
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,INDICATOR_MAX_BRIGHTNESS};
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,RGB_MATRIX_MAXIMUM_BRIGHTNESS};
|
||||
RGB rgb_ind = hsv_to_rgb(hsv_ind);
|
||||
|
||||
rgb_matrix_set_color(W_LED_INDEX, rgb_ind.r, rgb_ind.g, rgb_ind.b);
|
||||
|
|
|
@ -53,11 +53,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
/* RGB matrix indicator code
|
||||
It reads the current matrix color, offsets the hue by 30,
|
||||
and sets val to either 255 or, if defined, RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
and sets val to RGB_MATRIX_MAXIMUM_BRIGHTNESS (by default, 255)
|
||||
This is applied to both caps lock, and other indicator keys for layer 1 */
|
||||
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,INDICATOR_MAX_BRIGHTNESS};
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,RGB_MATRIX_MAXIMUM_BRIGHTNESS};
|
||||
RGB rgb_ind = hsv_to_rgb(hsv_ind);
|
||||
|
||||
/* Sets Caps to different color as indicator. If RGB mode is rain, and caps indicator is off, the LED will always be off.
|
||||
|
@ -70,7 +70,7 @@ bool rgb_matrix_indicators_user(void) {
|
|||
|
||||
/* Sets W, A, S, D, LGUI to a different color as layer indicator */
|
||||
if(IS_LAYER_ON(1)) {
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,INDICATOR_MAX_BRIGHTNESS};
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,RGB_MATRIX_MAXIMUM_BRIGHTNESS};
|
||||
RGB rgb_ind = hsv_to_rgb(hsv_ind);
|
||||
|
||||
rgb_matrix_set_color(W_LED_INDEX, rgb_ind.r, rgb_ind.g, rgb_ind.b);
|
||||
|
|
|
@ -61,13 +61,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define ENABLE_RGB_MATRIX_CUSTOM_SINGLE_COLOR_RAINDROPS // 0 Single color raindrops, random keys lighting up at randomized intensity
|
||||
#define ENABLE_RGB_MATRIX_CUSTOM_STATIC_GAME_MODE // - Game mode sets the entire matrix (static) once, then stops LED refreshes
|
||||
|
||||
#define INDICATOR_MAX_BRIGHTNESS 255
|
||||
#ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
#undef INDICATOR_MAX_BRIGHTNESS
|
||||
#define INDICATOR_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
#endif
|
||||
|
||||
|
||||
/* Define indicator LED indices, used for lighting effects */
|
||||
#define W_LED_INDEX 33
|
||||
#define A_LED_INDEX 47
|
||||
|
|
|
@ -53,11 +53,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
/* RGB matrix indicator code
|
||||
It reads the current matrix color, offsets the hue by 30,
|
||||
and sets val to either 255 or, if defined, RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
and sets val to RGB_MATRIX_MAXIMUM_BRIGHTNESS (by default, 255)
|
||||
This is applied to both caps lock, and other indicator keys for layer 1 */
|
||||
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,INDICATOR_MAX_BRIGHTNESS};
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,RGB_MATRIX_MAXIMUM_BRIGHTNESS};
|
||||
RGB rgb_ind = hsv_to_rgb(hsv_ind);
|
||||
|
||||
/* Sets Caps to different color as indicator. If RGB mode is rain, and caps indicator is off, the LED will always be off.
|
||||
|
@ -70,7 +70,7 @@ bool rgb_matrix_indicators_user(void) {
|
|||
|
||||
/* Sets W, A, S, D, LGUI to a different color as layer indicator */
|
||||
if(IS_LAYER_ON(1)) {
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,INDICATOR_MAX_BRIGHTNESS};
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,RGB_MATRIX_MAXIMUM_BRIGHTNESS};
|
||||
RGB rgb_ind = hsv_to_rgb(hsv_ind);
|
||||
|
||||
rgb_matrix_set_color(W_LED_INDEX, rgb_ind.r, rgb_ind.g, rgb_ind.b);
|
||||
|
|
|
@ -144,13 +144,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
/* RGB matrix indicator code
|
||||
It reads the current matrix color, offsets the hue by 30,
|
||||
and sets val to either 255 or, if defined, RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
and sets val to RGB_MATRIX_MAXIMUM_BRIGHTNESS (by default, 255)
|
||||
This is applied to both caps lock, and other indicator keys for layer 1 */
|
||||
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
/* Layer 2 (perf mode on this keymap) is not supposed to have LED refreshes, hence excluded */
|
||||
if (!IS_LAYER_ON(2)) {
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,INDICATOR_MAX_BRIGHTNESS};
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,RGB_MATRIX_MAXIMUM_BRIGHTNESS};
|
||||
RGB rgb_ind = hsv_to_rgb(hsv_ind);
|
||||
|
||||
/* Sets Caps to different color as indicator. If RGB mode is rain, and caps indicator is off, the LED will always be off.
|
||||
|
@ -163,7 +163,7 @@ bool rgb_matrix_indicators_user(void) {
|
|||
|
||||
/* Sets W, A, S, D, LGUI to a different color as layer indicator */
|
||||
if(IS_LAYER_ON(1)) {
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,INDICATOR_MAX_BRIGHTNESS};
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,RGB_MATRIX_MAXIMUM_BRIGHTNESS};
|
||||
RGB rgb_ind = hsv_to_rgb(hsv_ind);
|
||||
|
||||
rgb_matrix_set_color(W_LED_INDEX, rgb_ind.r, rgb_ind.g, rgb_ind.b);
|
||||
|
|
|
@ -53,11 +53,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
/* RGB matrix indicator code
|
||||
It reads the current matrix color, offsets the hue by 30,
|
||||
and sets val to either 255 or, if defined, RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
and sets val to RGB_MATRIX_MAXIMUM_BRIGHTNESS (by default, 255)
|
||||
This is applied to both caps lock, and other indicator keys for layer 1 */
|
||||
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,INDICATOR_MAX_BRIGHTNESS};
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,RGB_MATRIX_MAXIMUM_BRIGHTNESS};
|
||||
RGB rgb_ind = hsv_to_rgb(hsv_ind);
|
||||
|
||||
/* Sets Caps to different color as indicator. If RGB mode is rain, and caps indicator is off, the LED will always be off.
|
||||
|
@ -70,7 +70,7 @@ bool rgb_matrix_indicators_user(void) {
|
|||
|
||||
/* Sets W, A, S, D, LGUI to a different color as layer indicator */
|
||||
if(IS_LAYER_ON(1)) {
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,INDICATOR_MAX_BRIGHTNESS};
|
||||
HSV hsv_ind = {rgb_matrix_get_hue()+30,255,RGB_MATRIX_MAXIMUM_BRIGHTNESS};
|
||||
RGB rgb_ind = hsv_to_rgb(hsv_ind);
|
||||
|
||||
rgb_matrix_set_color(W_LED_INDEX, rgb_ind.r, rgb_ind.g, rgb_ind.b);
|
||||
|
|
|
@ -73,15 +73,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
// Code for Caps Locks indicator
|
||||
#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
|
||||
|
||||
#define CAPS_LOCK_MAX_BRIGHTNESS 0xFF
|
||||
#ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
#undef CAPS_LOCK_MAX_BRIGHTNESS
|
||||
#if !defined(CAPS_LOCK_MAX_BRIGHTNESS)
|
||||
#define CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
#endif
|
||||
|
||||
#define CAPS_LOCK_VAL_STEP 8
|
||||
#ifdef RGB_MATRIX_VAL_STEP
|
||||
#undef CAPS_LOCK_VAL_STEP
|
||||
#if !defined(CAPS_LOCK_VAL_STEP)
|
||||
#define CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue