aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-06 06:18:31 +0000
committerQMK Bot <hello@qmk.fm>2020-12-06 06:18:31 +0000
commit7043561459942c7cba8fef8547145196a8d03398 (patch)
treefebe0ac2417abf3ddd55f8d4a8c4766a9f7a9ff1 /drivers
parente199fb619081dddaf76f203b77660f9ba41a30bd (diff)
parent6b1f96dca8b1218c0e3de6ef23dbde107f8c4588 (diff)
downloadqmk_firmware-7043561459942c7cba8fef8547145196a8d03398.tar.gz
qmk_firmware-7043561459942c7cba8fef8547145196a8d03398.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'drivers')
-rw-r--r--drivers/issi/is31fl3731-simple.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/issi/is31fl3731-simple.c b/drivers/issi/is31fl3731-simple.c
index bd3bb4746..cffb4d87f 100644
--- a/drivers/issi/is31fl3731-simple.c
+++ b/drivers/issi/is31fl3731-simple.c
@@ -63,7 +63,7 @@ uint8_t g_twi_transfer_buffer[20];
63// buffers and the transfers in IS31FL3731_write_pwm_buffer() but it's 63// buffers and the transfers in IS31FL3731_write_pwm_buffer() but it's
64// probably not worth the extra complexity. 64// probably not worth the extra complexity.
65uint8_t g_pwm_buffer[LED_DRIVER_COUNT][144]; 65uint8_t g_pwm_buffer[LED_DRIVER_COUNT][144];
66bool g_pwm_buffer_update_required = false; 66bool g_pwm_buffer_update_required[LED_DRIVER_COUNT] = {false};
67 67
68/* There's probably a better way to init this... */ 68/* There's probably a better way to init this... */
69#if LED_DRIVER_COUNT == 1 69#if LED_DRIVER_COUNT == 1
@@ -75,7 +75,7 @@ uint8_t g_led_control_registers[LED_DRIVER_COUNT][18] = {{0}, {0}, {0}};
75#elif LED_DRIVER_COUNT == 4 75#elif LED_DRIVER_COUNT == 4
76uint8_t g_led_control_registers[LED_DRIVER_COUNT][18] = {{0}, {0}, {0}, {0}}; 76uint8_t g_led_control_registers[LED_DRIVER_COUNT][18] = {{0}, {0}, {0}, {0}};
77#endif 77#endif
78bool g_led_control_registers_update_required = false; 78bool g_led_control_registers_update_required[LED_DRIVER_COUNT] = {false};
79 79
80// This is the bit pattern in the LED control registers 80// This is the bit pattern in the LED control registers
81// (for matrix A, add one to register for matrix B) 81// (for matrix A, add one to register for matrix B)
@@ -190,8 +190,8 @@ void IS31FL3731_set_value(int index, uint8_t value) {
190 is31_led led = g_is31_leds[index]; 190 is31_led led = g_is31_leds[index];
191 191
192 // Subtract 0x24 to get the second index of g_pwm_buffer 192 // Subtract 0x24 to get the second index of g_pwm_buffer
193 g_pwm_buffer[led.driver][led.v - 0x24] = value; 193 g_pwm_buffer[led.driver][led.v - 0x24] = value;
194 g_pwm_buffer_update_required = true; 194 g_pwm_buffer_update_required[led.driver] = true;
195 } 195 }
196} 196}
197 197
@@ -213,20 +213,21 @@ void IS31FL3731_set_led_control_register(uint8_t index, bool value) {
213 g_led_control_registers[led.driver][control_register] &= ~(1 << bit_value); 213 g_led_control_registers[led.driver][control_register] &= ~(1 << bit_value);
214 } 214 }
215 215
216 g_led_control_registers_update_required = true; 216 g_led_control_registers_update_required[led.driver] = true;
217} 217}
218 218
219void IS31FL3731_update_pwm_buffers(uint8_t addr, uint8_t index) { 219void IS31FL3731_update_pwm_buffers(uint8_t addr, uint8_t index) {
220 if (g_pwm_buffer_update_required) { 220 if (g_pwm_buffer_update_required[index]) {
221 IS31FL3731_write_pwm_buffer(addr, g_pwm_buffer[index]); 221 IS31FL3731_write_pwm_buffer(addr, g_pwm_buffer[index]);
222 g_pwm_buffer_update_required = false; 222 g_pwm_buffer_update_required[index] = false;
223 } 223 }
224} 224}
225 225
226void IS31FL3731_update_led_control_registers(uint8_t addr, uint8_t index) { 226void IS31FL3731_update_led_control_registers(uint8_t addr, uint8_t index) {
227 if (g_led_control_registers_update_required) { 227 if (g_led_control_registers_update_required[index]) {
228 for (int i = 0; i < 18; i++) { 228 for (int i = 0; i < 18; i++) {
229 IS31FL3731_write_register(addr, i, g_led_control_registers[index][i]); 229 IS31FL3731_write_register(addr, i, g_led_control_registers[index][i]);
230 } 230 }
231 g_led_control_registers_update_required[index] = false;
231 } 232 }
232} 233}