Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added a basic RGBW functionality #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added a basic RGBW functionality #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 99 additions & 26 deletions src/WS2812B.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@


// Constructor when n is the number of LEDs in the strip
WS2812B::WS2812B(uint16_t number_of_leds) :
brightness(0), pixels(NULL)
WS2812B::WS2812B(uint16_t number_of_leds, uint8_t cScheme) :
brightness(0), pixels(NULL), cScheme(cScheme)
{
updateLength(number_of_leds);
}
Expand Down Expand Up @@ -62,8 +62,12 @@ void WS2812B::updateLength(uint16_t n)
free(doubleBuffer);
}

numBytes = (n<<3) + n + 2; // 9 encoded bytes per pixel. 1 byte empty peamble to fix issue with SPI MOSI and on byte at the end to clear down MOSI
// Note. (n<<3) +n is a fast way of doing n*9
if (cScheme == GRB)
numBytes = (n<<3) + n + 2; // 9 encoded bytes per pixel. 1 byte empty peamble to fix issue with SPI MOSI and on byte at the end to clear down MOSI
// Note. (n<<3) +n is a fast way of doing n*9
else
numBytes = (n<<3) + (n<<2) + 2; // 12 encoded bytes per pixel. 1 byte empty peamble to fix issue with SPI MOSI and on byte at the end to clear down MOSI
// Note. (n<<3) + (n<<2) = 8*n + 4*n = 12*n
if((doubleBuffer = (uint8_t *)malloc(numBytes*2)))
{
numLEDs = n;
Expand Down Expand Up @@ -125,24 +129,73 @@ void WS2812B::setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b)
*bptr++ = *tPtr++;
}

void WS2812B::setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b, uint8_t w)
{
uint8_t *bptr = pixels + (n<<3) + (n<<2) + 1;
uint8_t *tPtr = (uint8_t *)encoderLookup + g*2 + g;// need to index 3 x g into the lookup

*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;

tPtr = (uint8_t *)encoderLookup + r*2 + r;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;

tPtr = (uint8_t *)encoderLookup + b*2 + b;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;

tPtr = (uint8_t *)encoderLookup + w*2 + w;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
}

void WS2812B::setPixelColor(uint16_t n, uint32_t c)
{
uint8_t r,g,b;
uint8_t r,g,b,w;

if (cScheme == GRB)
{
if(brightness)
{
r = ((int)((uint8_t)(c >> 16)) * (int)brightness) >> 8;
g = ((int)((uint8_t)(c >> 8)) * (int)brightness) >> 8;
b = ((int)((uint8_t)c) * (int)brightness) >> 8;
}
else
{
r = (uint8_t)(c >> 16),
g = (uint8_t)(c >> 8),
b = (uint8_t)c;
}
{
r = ((int)((uint8_t)(c >> 16)) * (int)brightness) >> 8;
g = ((int)((uint8_t)(c >> 8)) * (int)brightness) >> 8;
b = ((int)((uint8_t)c) * (int)brightness) >> 8;
}
else
{
r = (uint8_t)(c >> 16),
g = (uint8_t)(c >> 8),
b = (uint8_t)c;
}
}
else
{
if(brightness)
{
w = ((int)((uint8_t)(c >> 24)) * (int)brightness) >> 8;
r = ((int)((uint8_t)(c >> 16)) * (int)brightness) >> 8;
g = ((int)((uint8_t)(c >> 8)) * (int)brightness) >> 8;
b = ((int)((uint8_t)c) * (int)brightness) >> 8;
}
else
{
w = (uint8_t)(c >> 24),
r = (uint8_t)(c >> 16),
g = (uint8_t)(c >> 8),
b = (uint8_t)c;
}
}

uint8_t *bptr = pixels + (n<<3) + n +1;
uint8_t *bptr = NULL;
if (cScheme == GRB)
bptr = pixels + (n<<3) + n +1;
else
bptr = pixels + (n<<3) + (n<<2) +1;
uint8_t *tPtr = (uint8_t *)encoderLookup + g*2 + g;// need to index 3 x g into the lookup

*bptr++ = *tPtr++;
Expand All @@ -158,6 +211,13 @@ void WS2812B::setPixelColor(uint16_t n, uint32_t c)
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
if (cScheme == GRB)
{
tPtr = (uint8_t *)encoderLookup + w*2 + w;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
}
}

// Convert separate R,G,B into packed 32-bit RGB color.
Expand Down Expand Up @@ -207,7 +267,7 @@ void WS2812B::setBrightness(uint8_t b) {
else if(b == 255) scale = 65535 / oldBrightness;
else scale = (((uint16_t)newBrightness << 8) - 1) / oldBrightness;
for(uint16_t i=0; i<numBytes; i++)
{
{
c = *ptr;
*ptr++ = (c * scale) >> 8;
}
Expand All @@ -225,14 +285,27 @@ uint8_t WS2812B::getBrightness(void) const {
*/
void WS2812B::clear()
{
uint8_t * bptr= pixels+1;// Note first byte in the buffer is a preable and is always zero. hence the +1
uint8_t *bptr= pixels+1;// Note first byte in the buffer is a preable and is always zero. hence the +1
uint8_t *tPtr;

for(int i=0;i< (numLEDs *3);i++)
{
tPtr = (uint8_t *)encoderLookup;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
}
if (cScheme == GRB)
{
for(int i=0;i< (numLEDs *3);i++)
{
tPtr = (uint8_t *)encoderLookup;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
}
}
else
{
for(int i=0;i< (numLEDs *4);i++)
{
tPtr = (uint8_t *)encoderLookup;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
*bptr++ = *tPtr++;
}
}
}
9 changes: 7 additions & 2 deletions src/WS2812B.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,21 @@ static const uint8_t encoderLookup[256*3]={ 0x92,0x49,0x24,0x92,0x49,0x26,0x92,0
#error No clock divisor available for this F_CPU
#endif

#define GRB 0
#define GRBW 1


class WS2812B {
public:

// Constructor: number of LEDs
WS2812B (uint16_t number_of_leds);// Constuctor
WS2812B (uint16_t number_of_leds, uint8_t cScheme);// Constuctor
~WS2812B();
void
begin(void),
show(void),
setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b),
// setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b, uint8_t w),
setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b, uint8_t w),
setPixelColor(uint16_t n, uint32_t c),
setBrightness(uint8_t),
clear(),
Expand All @@ -88,6 +92,7 @@ class WS2812B {
numBytes; // Size of 'pixels' buffer

uint8_t
cScheme,
brightness,
*pixels, // Holds the current LED color values, which the external API calls interact with 9 bytes per pixel + start + end empty bytes
*doubleBuffer, // Holds the start of the double buffer (1 buffer for async DMA transfer and one for the API interaction.
Expand Down