Fix compilation error when led/rgb process limit is zero. (#22328)

Co-authored-by: Drashna Jaelre <[email protected]>
qmk · Oct 24, 2023 · 7e0147f · 7e0147f
1 parent c245ee4
commit 7e0147f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
@@ -342,9 +342,8 @@ void led_matrix_task(void) {
  case RENDERING:
  led_task_render(effect);
  if (effect) {
- // Only run the basic indicators in the last render iteration (default there are 5 iterations)
- if (led_effect_params.iter == LED_MATRIX_LED_PROCESS_MAX_ITERATIONS) {
- led_matrix_indicators();
+ if (led_task_state == FLUSHING) {
+ led_matrix_indicators(); // ensure we only draw basic indicators once rendering is finished
  }
  led_matrix_indicators_advanced(&led_effect_params);
  }

diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h
@@ -88,7 +88,6 @@
 #ifndef LED_MATRIX_LED_PROCESS_LIMIT
 # define LED_MATRIX_LED_PROCESS_LIMIT ((LED_MATRIX_LED_COUNT + 4) / 5)
 #endif
-#define LED_MATRIX_LED_PROCESS_MAX_ITERATIONS ((LED_MATRIX_LED_COUNT + LED_MATRIX_LED_PROCESS_LIMIT - 1) / LED_MATRIX_LED_PROCESS_LIMIT)
 
 #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)

diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
@@ -383,8 +383,7 @@ void rgb_matrix_task(void) {
  case RENDERING:
  rgb_task_render(effect);
  if (effect) {
- // Only run the basic indicators in the last render iteration (default there are 5 iterations)
- if (rgb_effect_params.iter == RGB_MATRIX_LED_PROCESS_MAX_ITERATIONS) {
+ if (rgb_task_state == FLUSHING) { // ensure we only draw basic indicators once rendering is finished
  rgb_matrix_indicators();
  }
  rgb_matrix_indicators_advanced(&rgb_effect_params);

diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
@@ -106,7 +106,6 @@
 #ifndef RGB_MATRIX_LED_PROCESS_LIMIT
 # define RGB_MATRIX_LED_PROCESS_LIMIT ((RGB_MATRIX_LED_COUNT + 4) / 5)
 #endif
-#define RGB_MATRIX_LED_PROCESS_MAX_ITERATIONS ((RGB_MATRIX_LED_COUNT + RGB_MATRIX_LED_PROCESS_LIMIT - 1) / RGB_MATRIX_LED_PROCESS_LIMIT)
 
 #if defined(RGB_MATRIX_LED_PROCESS_LIMIT) && RGB_MATRIX_LED_PROCESS_LIMIT > 0 && RGB_MATRIX_LED_PROCESS_LIMIT < RGB_MATRIX_LED_COUNT
 # if defined(RGB_MATRIX_SPLIT)