~ruther/qmk_firmware

50bc2dbe77e533959c4b8f821a31b489d25c7cb7 — XScorpion2 6 years ago 61ce41a
Fixing incorrect usage of RGBLED_NUM in ws2812 driver when used with RGB Matrix (#5744)

2 files changed, 3 insertions(+), 3 deletions(-)

M drivers/avr/ws2812.c
M quantum/rgb_matrix_drivers.c
M drivers/avr/ws2812.c => drivers/avr/ws2812.c +1 -1
@@ 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;

M quantum/rgb_matrix_drivers.c => quantum/rgb_matrix_drivers.c +2 -2
@@ 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 )