Change DRIVER_LED_COUNT
to {LED,RGB}_MATRIX_LED_COUNT
(#18399)
This commit is contained in:
parent
d967de0df7
commit
36c410592d
577 changed files with 836 additions and 831 deletions
|
@ -170,7 +170,7 @@ void led_matrix_set_value(int index, uint8_t value) {
|
|||
|
||||
void led_matrix_set_value_all(uint8_t value) {
|
||||
#if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
|
||||
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++)
|
||||
for (uint8_t i = 0; i < LED_MATRIX_LED_COUNT; i++)
|
||||
led_matrix_set_value(i, value);
|
||||
#else
|
||||
# ifdef USE_CIE1931_CURVE
|
||||
|
@ -399,13 +399,13 @@ void led_matrix_indicators_advanced(effect_params_t *params) {
|
|||
* and not sure which would be better. Otherwise, this should be called from
|
||||
* led_task_render, right before the iter++ line.
|
||||
*/
|
||||
#if defined(LED_MATRIX_LED_PROCESS_LIMIT) && LED_MATRIX_LED_PROCESS_LIMIT > 0 && LED_MATRIX_LED_PROCESS_LIMIT < DRIVER_LED_TOTAL
|
||||
#if defined(LED_MATRIX_LED_PROCESS_LIMIT) && LED_MATRIX_LED_PROCESS_LIMIT > 0 && LED_MATRIX_LED_PROCESS_LIMIT < LED_MATRIX_LED_COUNT
|
||||
uint8_t min = LED_MATRIX_LED_PROCESS_LIMIT * (params->iter - 1);
|
||||
uint8_t max = min + LED_MATRIX_LED_PROCESS_LIMIT;
|
||||
if (max > DRIVER_LED_TOTAL) max = DRIVER_LED_TOTAL;
|
||||
if (max > LED_MATRIX_LED_COUNT) max = LED_MATRIX_LED_COUNT;
|
||||
#else
|
||||
uint8_t min = 0;
|
||||
uint8_t max = DRIVER_LED_TOTAL;
|
||||
uint8_t max = LED_MATRIX_LED_COUNT;
|
||||
#endif
|
||||
led_matrix_indicators_advanced_kb(min, max);
|
||||
led_matrix_indicators_advanced_user(min, max);
|
||||
|
|
|
@ -42,15 +42,15 @@
|
|||
#endif
|
||||
|
||||
#ifndef LED_MATRIX_LED_PROCESS_LIMIT
|
||||
# define LED_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5
|
||||
# define LED_MATRIX_LED_PROCESS_LIMIT (LED_MATRIX_LED_COUNT + 4) / 5
|
||||
#endif
|
||||
|
||||
#if defined(LED_MATRIX_LED_PROCESS_LIMIT) && LED_MATRIX_LED_PROCESS_LIMIT > 0 && LED_MATRIX_LED_PROCESS_LIMIT < DRIVER_LED_TOTAL
|
||||
#if defined(LED_MATRIX_LED_PROCESS_LIMIT) && LED_MATRIX_LED_PROCESS_LIMIT > 0 && LED_MATRIX_LED_PROCESS_LIMIT < LED_MATRIX_LED_COUNT
|
||||
# if defined(LED_MATRIX_SPLIT)
|
||||
# define LED_MATRIX_USE_LIMITS(min, max) \
|
||||
uint8_t min = LED_MATRIX_LED_PROCESS_LIMIT * params->iter; \
|
||||
uint8_t max = min + LED_MATRIX_LED_PROCESS_LIMIT; \
|
||||
if (max > DRIVER_LED_TOTAL) max = DRIVER_LED_TOTAL; \
|
||||
if (max > LED_MATRIX_LED_COUNT) max = LED_MATRIX_LED_COUNT; \
|
||||
uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT; \
|
||||
if (is_keyboard_left() && (max > k_led_matrix_split[0])) max = k_led_matrix_split[0]; \
|
||||
if (!(is_keyboard_left()) && (min < k_led_matrix_split[0])) min = k_led_matrix_split[0];
|
||||
|
@ -58,20 +58,20 @@
|
|||
# define LED_MATRIX_USE_LIMITS(min, max) \
|
||||
uint8_t min = LED_MATRIX_LED_PROCESS_LIMIT * params->iter; \
|
||||
uint8_t max = min + LED_MATRIX_LED_PROCESS_LIMIT; \
|
||||
if (max > DRIVER_LED_TOTAL) max = DRIVER_LED_TOTAL;
|
||||
if (max > LED_MATRIX_LED_COUNT) max = LED_MATRIX_LED_COUNT;
|
||||
# endif
|
||||
#else
|
||||
# if defined(LED_MATRIX_SPLIT)
|
||||
# define LED_MATRIX_USE_LIMITS(min, max) \
|
||||
uint8_t min = 0; \
|
||||
uint8_t max = DRIVER_LED_TOTAL; \
|
||||
uint8_t max = LED_MATRIX_LED_COUNT; \
|
||||
const uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT; \
|
||||
if (is_keyboard_left() && (max > k_led_matrix_split[0])) max = k_led_matrix_split[0]; \
|
||||
if (!(is_keyboard_left()) && (min < k_led_matrix_split[0])) min = k_led_matrix_split[0];
|
||||
# else
|
||||
# define LED_MATRIX_USE_LIMITS(min, max) \
|
||||
uint8_t min = 0; \
|
||||
uint8_t max = DRIVER_LED_TOTAL;
|
||||
uint8_t max = LED_MATRIX_LED_COUNT;
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
@ -181,9 +181,9 @@ static inline bool led_matrix_check_finished_leds(uint8_t led_idx) {
|
|||
uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT;
|
||||
return led_idx < k_led_matrix_split[0];
|
||||
} else
|
||||
return led_idx < DRIVER_LED_TOTAL;
|
||||
return led_idx < LED_MATRIX_LED_COUNT;
|
||||
#else
|
||||
return led_idx < DRIVER_LED_TOTAL;
|
||||
return led_idx < LED_MATRIX_LED_COUNT;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -96,7 +96,7 @@ static void init(void) {
|
|||
# endif
|
||||
# endif
|
||||
|
||||
for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
|
||||
for (int index = 0; index < LED_MATRIX_LED_COUNT; index++) {
|
||||
# if defined(IS31FL3731)
|
||||
IS31FL3731_set_led_control_register(index, true);
|
||||
# elif defined(IS31FL3733)
|
||||
|
|
|
@ -76,8 +76,8 @@ typedef struct PACKED {
|
|||
|
||||
typedef struct PACKED {
|
||||
uint8_t matrix_co[MATRIX_ROWS][MATRIX_COLS];
|
||||
led_point_t point[DRIVER_LED_TOTAL];
|
||||
uint8_t flags[DRIVER_LED_TOTAL];
|
||||
led_point_t point[LED_MATRIX_LED_COUNT];
|
||||
uint8_t flags[LED_MATRIX_LED_COUNT];
|
||||
} led_config_t;
|
||||
|
||||
typedef union {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue