diff options
| author | XScorpion2 <rcalt2vt@gmail.com> | 2019-05-01 07:48:33 -0500 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-05-01 05:48:33 -0700 |
| commit | 50bc2dbe77e533959c4b8f821a31b489d25c7cb7 (patch) | |
| tree | bed3ff6220f09b717ec5c61a154ed50ad5298f9f | |
| parent | 61ce41ae13242adb113f61ec03dd9ed26acee26b (diff) | |
| download | qmk_firmware-50bc2dbe77e533959c4b8f821a31b489d25c7cb7.tar.gz qmk_firmware-50bc2dbe77e533959c4b8f821a31b489d25c7cb7.zip | |
Fixing incorrect usage of RGBLED_NUM in ws2812 driver when used with RGB Matrix (#5744)
| -rw-r--r-- | drivers/avr/ws2812.c | 2 | ||||
| -rw-r--r-- | quantum/rgb_matrix_drivers.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/avr/ws2812.c b/drivers/avr/ws2812.c index b3ed4fd0b..7c3cb5174 100644 --- a/drivers/avr/ws2812.c +++ b/drivers/avr/ws2812.c | |||
| @@ -158,7 +158,7 @@ void inline ws2812_setled(int i, uint8_t r, uint8_t g, uint8_t b) | |||
| 158 | 158 | ||
| 159 | void ws2812_setled_all (uint8_t r, uint8_t g, uint8_t b) | 159 | void ws2812_setled_all (uint8_t r, uint8_t g, uint8_t b) |
| 160 | { | 160 | { |
| 161 | for (int i = 0; i < RGBLED_NUM; i++) { | 161 | for (int i = 0; i < sizeof(led)/sizeof(led[0]); i++) { |
| 162 | led[i].r = r; | 162 | led[i].r = r; |
| 163 | led[i].g = g; | 163 | led[i].g = g; |
| 164 | led[i].b = b; | 164 | led[i].b = b; |
diff --git a/quantum/rgb_matrix_drivers.c b/quantum/rgb_matrix_drivers.c index 3814dd61f..1d64dc909 100644 --- a/quantum/rgb_matrix_drivers.c +++ b/quantum/rgb_matrix_drivers.c | |||
| @@ -99,12 +99,12 @@ const rgb_matrix_driver_t rgb_matrix_driver = { | |||
| 99 | 99 | ||
| 100 | #elif defined(WS2812) | 100 | #elif defined(WS2812) |
| 101 | 101 | ||
| 102 | extern LED_TYPE led[RGBLED_NUM]; | 102 | extern LED_TYPE led[DRIVER_LED_TOTAL]; |
| 103 | 103 | ||
| 104 | static void flush( void ) | 104 | static void flush( void ) |
| 105 | { | 105 | { |
| 106 | // Assumes use of RGB_DI_PIN | 106 | // Assumes use of RGB_DI_PIN |
| 107 | ws2812_setleds(led, RGBLED_NUM); | 107 | ws2812_setleds(led, DRIVER_LED_TOTAL); |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | static void init( void ) | 110 | static void init( void ) |