aboutsummaryrefslogtreecommitdiff
path: root/quantum/rgb_matrix_drivers.c
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2020-06-20 15:07:26 -0700
committerGitHub <noreply@github.com>2020-06-20 23:07:26 +0100
commit30cdf9331a0a5b78ddc9d0aff45ff1168de97ae8 (patch)
treebaffc089a5389db00caf4f8616f3818c53a4dcdb /quantum/rgb_matrix_drivers.c
parent8252f378d9b453b0078699363543be501c9b81d8 (diff)
downloadqmk_firmware-30cdf9331a0a5b78ddc9d0aff45ff1168de97ae8.tar.gz
qmk_firmware-30cdf9331a0a5b78ddc9d0aff45ff1168de97ae8.zip
Change `led` variable in rgb_matrix_drivers to avoid conflicts (#9412)
* Change `led` to `led_matrix` in rgb_matrix_drivers Is a minor change that only affects the driver file. However, this will allow somebody to run rgblight along side rgb matrix using the ws2812 driver, as well. Specifically, so you can use the custom driver for rgblight to set a different pin (barring a change to the `ws2812_setleds` function). Courtesy of discord conversion: https://discordapp.com/channels/440868230475677696/568161140534935572/721555623191248906 * Change name to be super specific * Update rgb_matrix_drivers.c
Diffstat (limited to 'quantum/rgb_matrix_drivers.c')
-rw-r--r--quantum/rgb_matrix_drivers.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/quantum/rgb_matrix_drivers.c b/quantum/rgb_matrix_drivers.c
index 204b6c551..222593608 100644
--- a/quantum/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix_drivers.c
@@ -115,27 +115,27 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
115#elif defined(WS2812) 115#elif defined(WS2812)
116 116
117// LED color buffer 117// LED color buffer
118LED_TYPE led[DRIVER_LED_TOTAL]; 118LED_TYPE rgb_matrix_ws2812_array[DRIVER_LED_TOTAL];
119 119
120static void init(void) {} 120static void init(void) {}
121 121
122static void flush(void) { 122static void flush(void) {
123 // Assumes use of RGB_DI_PIN 123 // Assumes use of RGB_DI_PIN
124 ws2812_setleds(led, DRIVER_LED_TOTAL); 124 ws2812_setleds(rgb_matrix_ws2812_array, DRIVER_LED_TOTAL);
125} 125}
126 126
127// Set an led in the buffer to a color 127// Set an led in the buffer to a color
128static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) { 128static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) {
129 led[i].r = r; 129 rgb_matrix_ws2812_array[i].r = r;
130 led[i].g = g; 130 rgb_matrix_ws2812_array[i].g = g;
131 led[i].b = b; 131 rgb_matrix_ws2812_array[i].b = b;
132# ifdef RGBW 132# ifdef RGBW
133 convert_rgb_to_rgbw(led[i]); 133 convert_rgb_to_rgbw(rgb_matrix_ws2812_array[i]);
134# endif 134# endif
135} 135}
136 136
137static void setled_all(uint8_t r, uint8_t g, uint8_t b) { 137static void setled_all(uint8_t r, uint8_t g, uint8_t b) {
138 for (int i = 0; i < sizeof(led) / sizeof(led[0]); i++) { 138 for (int i = 0; i < sizeof(rgb_matrix_ws2812_array) / sizeof(rgb_matrix_ws2812_array[0]); i++) {
139 setled(i, r, g, b); 139 setled(i, r, g, b);
140 } 140 }
141} 141}