From 60e4921378d879eed110f801328e9642f35fa1e9 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 9 Nov 2019 07:51:39 -0800 Subject: Unify RGB and RGBW commands (#7297) * Fix unicode in comments Co-Authored-By: fauxpark * Remove separate RGBW implementation for a unified function * Set White to 0 in RGBW LEDs This is just to get this working, later, proper brightness can be handled elsewhere. * Use us instead of nanoseconds(?) since it renders correctly on web * Remove RGBW function from arm/ws2812.h * Remove RGBW function from arm/ws2812.c * Formatting changes * Add doc info --- drivers/arm/ws2812.c | 11 +++-------- drivers/arm/ws2812.h | 3 +-- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'drivers/arm') diff --git a/drivers/arm/ws2812.c b/drivers/arm/ws2812.c index b076eff330..fa702fca98 100644 --- a/drivers/arm/ws2812.c +++ b/drivers/arm/ws2812.c @@ -84,17 +84,12 @@ void ws2812_setleds(LED_TYPE *ledarray, uint16_t leds) { sendByte(ledarray[i].g); sendByte(ledarray[i].r); sendByte(ledarray[i].b); +#ifdef RGBW + sendByte(ledarray[i].w); +#endif } wait_ns(RES); chSysUnlock(); } - -// Setleds for SK6812RGBW -void ws2812_setleds_rgbw(LED_TYPE *ledarray, uint16_t leds) { -// not supported - for now error out if its enabled -#ifdef RGBW -# error "RGBW not supported" -#endif -} diff --git a/drivers/arm/ws2812.h b/drivers/arm/ws2812.h index bf5c9fd0f1..41c22a00b8 100644 --- a/drivers/arm/ws2812.h +++ b/drivers/arm/ws2812.h @@ -11,7 +11,6 @@ * The functions will perform the following actions: * - Set the data-out pin as output * - Send out the LED data - * - Wait 50�s to reset the LEDs + * - Wait 50us to reset the LEDs */ void ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds); -void ws2812_setleds_rgbw(LED_TYPE *ledarray, uint16_t number_of_leds); -- cgit v1.2.3