summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXScorpion2 <rcalt2vt@gmail.com>2019-05-01 14:48:33 +0200
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-05-01 14:48:33 +0200
commit50bc2dbe77e533959c4b8f821a31b489d25c7cb7 (patch)
treebed3ff6220f09b717ec5c61a154ed50ad5298f9f
parent61ce41ae13242adb113f61ec03dd9ed26acee26b (diff)
downloadqmk_firmware-50bc2dbe77e533959c4b8f821a31b489d25c7cb7.tar.gz
qmk_firmware-50bc2dbe77e533959c4b8f821a31b489d25c7cb7.tar.xz
Fixing incorrect usage of RGBLED_NUM in ws2812 driver when used with RGB Matrix (#5744)
-rw-r--r--drivers/avr/ws2812.c2
-rw-r--r--quantum/rgb_matrix_drivers.c4
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)
void ws2812_setled_all (uint8_t r, uint8_t g, uint8_t b)
{
- for (int i = 0; i < RGBLED_NUM; i++) {
+ for (int i = 0; i < sizeof(led)/sizeof(led[0]); i++) {
led[i].r = r;
led[i].g = g;
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 = {
#elif defined(WS2812)
-extern LED_TYPE led[RGBLED_NUM];
+extern LED_TYPE led[DRIVER_LED_TOTAL];
static void flush( void )
{
// Assumes use of RGB_DI_PIN
- ws2812_setleds(led, RGBLED_NUM);
+ ws2812_setleds(led, DRIVER_LED_TOTAL);
}
static void init( void )