summaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2024-09-15 10:08:29 +1000
committerGitHub <noreply@github.com>2024-09-15 10:08:29 +1000
commite84104fe8d648e582eba3e3e4ba0bc7187adbee4 (patch)
tree105a4ed604e15622326918161b39ef066a22a757 /quantum
parentd48aac6a2c9f4360c60d7e7927bec5a472bf3da0 (diff)
Reinstate global `k_rgb_matrix_split` (#24388)
Diffstat (limited to 'quantum')
-rw-r--r--quantum/led_matrix/led_matrix.c6
-rw-r--r--quantum/rgb_matrix/rgb_matrix.c11
2 files changed, 9 insertions, 8 deletions
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index 798ab9a120..a5f0296f8d 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -387,7 +387,6 @@ struct led_matrix_limits_t led_matrix_get_limits(uint8_t iter) {
387 limits.led_min_index = LED_MATRIX_LED_PROCESS_LIMIT * (iter); 387 limits.led_min_index = LED_MATRIX_LED_PROCESS_LIMIT * (iter);
388 limits.led_max_index = limits.led_min_index + LED_MATRIX_LED_PROCESS_LIMIT; 388 limits.led_max_index = limits.led_min_index + LED_MATRIX_LED_PROCESS_LIMIT;
389 if (limits.led_max_index > LED_MATRIX_LED_COUNT) limits.led_max_index = LED_MATRIX_LED_COUNT; 389 if (limits.led_max_index > LED_MATRIX_LED_COUNT) limits.led_max_index = LED_MATRIX_LED_COUNT;
390 uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT;
391 if (is_keyboard_left() && (limits.led_max_index > k_led_matrix_split[0])) limits.led_max_index = k_led_matrix_split[0]; 390 if (is_keyboard_left() && (limits.led_max_index > k_led_matrix_split[0])) limits.led_max_index = k_led_matrix_split[0];
392 if (!(is_keyboard_left()) && (limits.led_min_index < k_led_matrix_split[0])) limits.led_min_index = k_led_matrix_split[0]; 391 if (!(is_keyboard_left()) && (limits.led_min_index < k_led_matrix_split[0])) limits.led_min_index = k_led_matrix_split[0];
393# else 392# else
@@ -397,9 +396,8 @@ struct led_matrix_limits_t led_matrix_get_limits(uint8_t iter) {
397# endif 396# endif
398#else 397#else
399# if defined(LED_MATRIX_SPLIT) 398# if defined(LED_MATRIX_SPLIT)
400 limits.led_min_index = 0; 399 limits.led_min_index = 0;
401 limits.led_max_index = LED_MATRIX_LED_COUNT; 400 limits.led_max_index = LED_MATRIX_LED_COUNT;
402 const uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT;
403 if (is_keyboard_left() && (limits.led_max_index > k_led_matrix_split[0])) limits.led_max_index = k_led_matrix_split[0]; 401 if (is_keyboard_left() && (limits.led_max_index > k_led_matrix_split[0])) limits.led_max_index = k_led_matrix_split[0];
404 if (!(is_keyboard_left()) && (limits.led_min_index < k_led_matrix_split[0])) limits.led_min_index = k_led_matrix_split[0]; 402 if (!(is_keyboard_left()) && (limits.led_min_index < k_led_matrix_split[0])) limits.led_min_index = k_led_matrix_split[0];
405# else 403# else
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index 4d55a3d5fe..0ea421d1c5 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -83,6 +83,11 @@ static uint32_t rgb_timer_buffer;
83static last_hit_t last_hit_buffer; 83static last_hit_t last_hit_buffer;
84#endif // RGB_MATRIX_KEYREACTIVE_ENABLED 84#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
85 85
86// split rgb matrix
87#if defined(RGB_MATRIX_SPLIT)
88const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;
89#endif
90
86EECONFIG_DEBOUNCE_HELPER(rgb_matrix, EECONFIG_RGB_MATRIX, rgb_matrix_config); 91EECONFIG_DEBOUNCE_HELPER(rgb_matrix, EECONFIG_RGB_MATRIX, rgb_matrix_config);
87 92
88void eeconfig_update_rgb_matrix(void) { 93void eeconfig_update_rgb_matrix(void) {
@@ -399,7 +404,6 @@ struct rgb_matrix_limits_t rgb_matrix_get_limits(uint8_t iter) {
399 limits.led_min_index = RGB_MATRIX_LED_PROCESS_LIMIT * (iter); 404 limits.led_min_index = RGB_MATRIX_LED_PROCESS_LIMIT * (iter);
400 limits.led_max_index = limits.led_min_index + RGB_MATRIX_LED_PROCESS_LIMIT; 405 limits.led_max_index = limits.led_min_index + RGB_MATRIX_LED_PROCESS_LIMIT;
401 if (limits.led_max_index > RGB_MATRIX_LED_COUNT) limits.led_max_index = RGB_MATRIX_LED_COUNT; 406 if (limits.led_max_index > RGB_MATRIX_LED_COUNT) limits.led_max_index = RGB_MATRIX_LED_COUNT;
402 uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;
403 if (is_keyboard_left() && (limits.led_max_index > k_rgb_matrix_split[0])) limits.led_max_index = k_rgb_matrix_split[0]; 407 if (is_keyboard_left() && (limits.led_max_index > k_rgb_matrix_split[0])) limits.led_max_index = k_rgb_matrix_split[0];
404 if (!(is_keyboard_left()) && (limits.led_min_index < k_rgb_matrix_split[0])) limits.led_min_index = k_rgb_matrix_split[0]; 408 if (!(is_keyboard_left()) && (limits.led_min_index < k_rgb_matrix_split[0])) limits.led_min_index = k_rgb_matrix_split[0];
405# else 409# else
@@ -409,9 +413,8 @@ struct rgb_matrix_limits_t rgb_matrix_get_limits(uint8_t iter) {
409# endif 413# endif
410#else 414#else
411# if defined(RGB_MATRIX_SPLIT) 415# if defined(RGB_MATRIX_SPLIT)
412 limits.led_min_index = 0; 416 limits.led_min_index = 0;
413 limits.led_max_index = RGB_MATRIX_LED_COUNT; 417 limits.led_max_index = RGB_MATRIX_LED_COUNT;
414 const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;
415 if (is_keyboard_left() && (limits.led_max_index > k_rgb_matrix_split[0])) limits.led_max_index = k_rgb_matrix_split[0]; 418 if (is_keyboard_left() && (limits.led_max_index > k_rgb_matrix_split[0])) limits.led_max_index = k_rgb_matrix_split[0];
416 if (!(is_keyboard_left()) && (limits.led_min_index < k_rgb_matrix_split[0])) limits.led_min_index = k_rgb_matrix_split[0]; 419 if (!(is_keyboard_left()) && (limits.led_min_index < k_rgb_matrix_split[0])) limits.led_min_index = k_rgb_matrix_split[0];
417# else 420# else