aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--quantum/led_matrix.c33
-rw-r--r--quantum/split_common/transport.c29
2 files changed, 56 insertions, 6 deletions
diff --git a/quantum/led_matrix.c b/quantum/led_matrix.c
index 69600c498..890573022 100644
--- a/quantum/led_matrix.c
+++ b/quantum/led_matrix.c
@@ -90,6 +90,11 @@ static uint32_t led_timer_buffer;
90static last_hit_t last_hit_buffer; 90static last_hit_t last_hit_buffer;
91#endif // LED_MATRIX_KEYREACTIVE_ENABLED 91#endif // LED_MATRIX_KEYREACTIVE_ENABLED
92 92
93// split led matrix
94#if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
95const uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT;
96#endif
97
93void eeconfig_read_led_matrix(void) { eeprom_read_block(&led_matrix_eeconfig, EECONFIG_LED_MATRIX, sizeof(led_matrix_eeconfig)); } 98void eeconfig_read_led_matrix(void) { eeprom_read_block(&led_matrix_eeconfig, EECONFIG_LED_MATRIX, sizeof(led_matrix_eeconfig)); }
94 99
95void eeconfig_update_led_matrix(void) { eeprom_update_block(&led_matrix_eeconfig, EECONFIG_LED_MATRIX, sizeof(led_matrix_eeconfig)); } 100void eeconfig_update_led_matrix(void) { eeprom_update_block(&led_matrix_eeconfig, EECONFIG_LED_MATRIX, sizeof(led_matrix_eeconfig)); }
@@ -128,22 +133,38 @@ uint8_t led_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *l
128void led_matrix_update_pwm_buffers(void) { led_matrix_driver.flush(); } 133void led_matrix_update_pwm_buffers(void) { led_matrix_driver.flush(); }
129 134
130void led_matrix_set_value(int index, uint8_t value) { 135void led_matrix_set_value(int index, uint8_t value) {
131#ifdef USE_CIE1931_CURVE 136#if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
132 led_matrix_driver.set_value(index, pgm_read_byte(&CIE1931_CURVE[value])); 137 if (!is_keyboard_left() && index >= k_led_matrix_split[0])
133#else 138# ifdef USE_CIE1931_CURVE
134 led_matrix_driver.set_value(index, value); 139 led_matrix_driver.set_value(index - k_led_matrix_split[0], pgm_read_byte(&CIE1931_CURVE[value]));
140# else
141 led_matrix_driver.set_value(index - k_led_matrix_split[0], value);
142# endif
143 else if (is_keyboard_left() && index < k_led_matrix_split[0])
135#endif 144#endif
145# ifdef USE_CIE1931_CURVE
146 led_matrix_driver.set_value(index, pgm_read_byte(&CIE1931_CURVE[value]));
147# else
148 led_matrix_driver.set_value(index, value);
149# endif
136} 150}
137 151
138void led_matrix_set_value_all(uint8_t value) { 152void led_matrix_set_value_all(uint8_t value) {
139#ifdef USE_CIE1931_CURVE 153#if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
140 led_matrix_driver.set_value_all(pgm_read_byte(&CIE1931_CURVE[value])); 154 for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) led_matrix_set_value(i, value);
141#else 155#else
156# ifdef USE_CIE1931_CURVE
157 led_matrix_driver.set_value_all(pgm_read_byte(&CIE1931_CURVE[value]));
158# else
142 led_matrix_driver.set_value_all(value); 159 led_matrix_driver.set_value_all(value);
160# endif
143#endif 161#endif
144} 162}
145 163
146void process_led_matrix(uint8_t row, uint8_t col, bool pressed) { 164void process_led_matrix(uint8_t row, uint8_t col, bool pressed) {
165#ifndef LED_MATRIX_SPLIT
166 if (!is_keyboard_master()) return;
167#endif
147#if LED_DISABLE_TIMEOUT > 0 168#if LED_DISABLE_TIMEOUT > 0
148 led_anykey_timer = 0; 169 led_anykey_timer = 0;
149#endif // LED_DISABLE_TIMEOUT > 0 170#endif // LED_DISABLE_TIMEOUT > 0
diff --git a/quantum/split_common/transport.c b/quantum/split_common/transport.c
index 27a1c0d3a..7ea925b51 100644
--- a/quantum/split_common/transport.c
+++ b/quantum/split_common/transport.c
@@ -22,6 +22,9 @@ static pin_t encoders_pad[] = ENCODERS_PAD_A;
22# define NUMBER_OF_ENCODERS (sizeof(encoders_pad) / sizeof(pin_t)) 22# define NUMBER_OF_ENCODERS (sizeof(encoders_pad) / sizeof(pin_t))
23#endif 23#endif
24 24
25#if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
26# include "led_matrix.h"
27#endif
25#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) 28#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
26# include "rgb_matrix.h" 29# include "rgb_matrix.h"
27#endif 30#endif
@@ -58,6 +61,10 @@ typedef struct _I2C_slave_buffer_t {
58# ifdef WPM_ENABLE 61# ifdef WPM_ENABLE
59 uint8_t current_wpm; 62 uint8_t current_wpm;
60# endif 63# endif
64# if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
65 led_eeconfig_t led_matrix;
66 bool led_suspend_state;
67# endif
61# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) 68# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
62 rgb_config_t rgb_matrix; 69 rgb_config_t rgb_matrix;
63 bool rgb_suspend_state; 70 bool rgb_suspend_state;
@@ -76,6 +83,8 @@ static I2C_slave_buffer_t *const i2c_buffer = (I2C_slave_buffer_t *)i2c_slave_re
76# define I2C_RGB_START offsetof(I2C_slave_buffer_t, rgblight_sync) 83# define I2C_RGB_START offsetof(I2C_slave_buffer_t, rgblight_sync)
77# define I2C_ENCODER_START offsetof(I2C_slave_buffer_t, encoder_state) 84# define I2C_ENCODER_START offsetof(I2C_slave_buffer_t, encoder_state)
78# define I2C_WPM_START offsetof(I2C_slave_buffer_t, current_wpm) 85# define I2C_WPM_START offsetof(I2C_slave_buffer_t, current_wpm)
86# define I2C_LED_MATRIX_START offsetof(I2C_slave_buffer_t, led_matrix)
87# define I2C_LED_SUSPEND_START offsetof(I2C_slave_buffer_t, led_suspend_state)
79# define I2C_RGB_MATRIX_START offsetof(I2C_slave_buffer_t, rgb_matrix) 88# define I2C_RGB_MATRIX_START offsetof(I2C_slave_buffer_t, rgb_matrix)
80# define I2C_RGB_SUSPEND_START offsetof(I2C_slave_buffer_t, rgb_suspend_state) 89# define I2C_RGB_SUSPEND_START offsetof(I2C_slave_buffer_t, rgb_suspend_state)
81 90
@@ -151,6 +160,10 @@ bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[])
151# endif 160# endif
152# endif 161# endif
153 162
163# if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
164 i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_LED_MATRIX_START, (void *)led_matrix_eeconfig, sizeof(i2c_buffer->led_matrix), TIMEOUT);
165 i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_LED_SUSPEND_START, (void *)g_suspend_state, sizeof(i2c_buffer->led_suspend_state), TIMEOUT);
166# endif
154# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) 167# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
155 i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_RGB_MATRIX_START, (void *)rgb_matrix_config, sizeof(i2c_buffer->rgb_matrix), TIMEOUT); 168 i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_RGB_MATRIX_START, (void *)rgb_matrix_config, sizeof(i2c_buffer->rgb_matrix), TIMEOUT);
156 i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_RGB_SUSPEND_START, (void *)g_suspend_state, sizeof(i2c_buffer->rgb_suspend_state), TIMEOUT); 169 i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_RGB_SUSPEND_START, (void *)g_suspend_state, sizeof(i2c_buffer->rgb_suspend_state), TIMEOUT);
@@ -202,6 +215,10 @@ void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[])
202# endif 215# endif
203# endif 216# endif
204 217
218# if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
219 memcpy((void*)i2c_buffer->led_matrix, (void *)led_matrix_eeconfig, sizeof(i2c_buffer->led_matrix));
220 memcpy((void*)i2c_buffer->led_suspend_state, (void *)g_suspend_state, sizeof(i2c_buffer->led_suspend_state));
221# endif
205# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) 222# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
206 memcpy((void *)i2c_buffer->rgb_matrix, (void *)rgb_matrix_config, sizeof(i2c_buffer->rgb_matrix)); 223 memcpy((void *)i2c_buffer->rgb_matrix, (void *)rgb_matrix_config, sizeof(i2c_buffer->rgb_matrix));
207 memcpy((void *)i2c_buffer->rgb_suspend_state, (void *)g_suspend_state, sizeof(i2c_buffer->rgb_suspend_state)); 224 memcpy((void *)i2c_buffer->rgb_suspend_state, (void *)g_suspend_state, sizeof(i2c_buffer->rgb_suspend_state));
@@ -246,6 +263,10 @@ typedef struct _Serial_m2s_buffer_t {
246# ifdef WPM_ENABLE 263# ifdef WPM_ENABLE
247 uint8_t current_wpm; 264 uint8_t current_wpm;
248# endif 265# endif
266# if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
267 led_eeconfig_t led_matrix;
268 bool led_suspend_state;
269# endif
249# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) 270# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
250 rgb_config_t rgb_matrix; 271 rgb_config_t rgb_matrix;
251 bool rgb_suspend_state; 272 bool rgb_suspend_state;
@@ -368,6 +389,10 @@ bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[])
368# endif 389# endif
369# endif 390# endif
370 391
392# if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
393 serial_m2s_buffer.led_matrix = led_matrix_econfig;
394 serial_m2s_buffer.led_suspend_state = g_suspend_state;
395# endif
371# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) 396# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
372 serial_m2s_buffer.rgb_matrix = rgb_matrix_config; 397 serial_m2s_buffer.rgb_matrix = rgb_matrix_config;
373 serial_m2s_buffer.rgb_suspend_state = g_suspend_state; 398 serial_m2s_buffer.rgb_suspend_state = g_suspend_state;
@@ -412,6 +437,10 @@ void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[])
412# endif 437# endif
413# endif 438# endif
414 439
440# if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
441 led_matrix_eeconfig = serial_m2s_buffer.led_matrix;
442 g_suspend_state = serial_m2s_buffer.led_suspend_state;
443# endif
415# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) 444# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
416 rgb_matrix_config = serial_m2s_buffer.rgb_matrix; 445 rgb_matrix_config = serial_m2s_buffer.rgb_matrix;
417 g_suspend_state = serial_m2s_buffer.rgb_suspend_state; 446 g_suspend_state = serial_m2s_buffer.rgb_suspend_state;