Skip to content

Commit

Permalink
Adds support for WS2813, bumped version to 0.0.14
Browse files Browse the repository at this point in the history 
- WS2813 300us reset timing by default (for WS2812/WS2812B as well), with WS2812B_FAST/WS2812B2_FAST added for legacy 50us reset timing.
  • Loading branch information
@technobly
technobly committed Jun 7, 2017
1 parent 6705310 commit 29c8b96
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 90 deletions.
10 changes: 6 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ Also now supports the [RedBear Duo](https://github.com/redbear/Duo).
Implementation based on Adafruit's NeoPixel Library.

## Supported Pixel Types
- 800 KHz and 400kHz bitstream WS2813, WS2812, WS2812B and WS2811
- 800 KHz WS2812, WS2812B, WS2813 and 400kHz bitstream and WS2811
- 800 KHz bitstream SK6812RGBW (NeoPixel RGBW pixel strips)
- (use 'SK6812RGBW' as `PIXEL_TYPE`)
(use 'SK6812RGBW' as PIXEL_TYPE)

The most common kinds are WS2812 (6-pin part), WS2812B (4-pin part) and SK6812RGBW (3 colors + white).
The most common kinds are WS2812/WS2813 (6-pin part), WS2812B (4-pin part) and SK6812RGBW (3 colors + white).

#### Also supports these less common pixels

Expand Down Expand Up @@ -64,7 +64,9 @@ _Note: for some stripes like those with the TM1829, you need to count the number
`PIXEL_PIN` is the pin number where your NeoPixel are connected (A0-A7, D0-D7, etc). Most pins are valid. If omitted, D2 is used.
`PIXEL_TYPE` is the type of LED, one of WS2813, WS2812, WS2812B, WS2812B2, WS2811, TM1803, TM1829, SK6812RGBW. If omitted, WS2812B is used.
`PIXEL_TYPE` is the type of LED, one of WS2811, WS2812, WS2812B, WS2812B2, WS2813, TM1803, TM1829, SK6812RGBW. If omitted, WS2812B is used.
_Note: For legacy 50us reset pulse timing on WS2812/WS2812B or WS2812B2, select WS2812B_FAST or WS2812B2_FAST respectively. Otherwise, 300us timing will be used._
_Note: RGB order is automatically applied to WS2811, WS2812/WS2812B/WS2812B2/WS2813/TM1803 is GRB order._
Expand Down
19 changes: 12 additions & 7 deletions examples/extra-examples/extra-examples.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*-------------------------------------------------------------------------
Spark Core, Particle Photon, P1, Electron and RedBear Duo library to control
WS2811/WS2812 based RGB LED devices such as Adafruit NeoPixel strips.
WS2811/WS2812/WS2813 based RGB LED devices such as Adafruit NeoPixel strips.
Supports:
- 800 KHz and 400kHz bitstream WS2812, WS2812B and WS2811
- 800 KHz WS2812, WS2812B, WS2813 and 400kHz bitstream and WS2811
- 800 KHz bitstream SK6812RGBW (NeoPixel RGBW pixel strips)
(use 'SK6812RGBW' as PIXEL_TYPE)
Expand Down Expand Up @@ -60,14 +60,19 @@ SYSTEM_MODE(AUTOMATIC);
// of individual LEDs!
// Parameter 2 = pin number (most are valid)
// note: if not specified, D2 is selected for you.
// Parameter 3 = pixel type [ WS2812, WS2812B, WS2812B2, WS2811,
// TM1803, TM1829, SK6812RGBW ]
// note: if not specified, WS2812B is selected for you.
// Parameter 3 = pixel type [ WS2812, WS2812B, WS2812B2, WS2813, WS2811,
// TM1803, TM1829, SK6812RGBW, WS2812B_FAST,
// WS2812B2_FAST ]
// note: if not specified, WS2812B is selected for you which
// is the same as WS2812 or WS2813 in operation.
// note: RGB order is automatically applied to WS2811,
// WS2812/WS2812B/WS2812B2/TM1803 is GRB order.
// WS2812/WS2812B/WS2812B2/WS2813/TM1803 is GRB order.
// note: For legacy 50us reset pulse timing on WS2812/WS2812B
// or WS2812B2, select WS2812B_FAST or WS2812B2_FAST
// respectively. Otherwise 300us timing will be used.
//
// 800 KHz bitstream 800 KHz bitstream (most NeoPixel products
// WS2812 (6-pin part)/WS2812B (4-pin part)/SK6812RGBW (RGB+W) )
// WS2812/WS2813 (6-pin part)/WS2812B (4-pin part)/SK6812RGBW (RGB+W) )
//
// 400 KHz bitstream (classic 'v1' (not v2) FLORA pixels, WS2811 drivers)
// (Radio Shack Tri-Color LED Strip - TM1803 driver
Expand Down
2 changes: 1 addition & 1 deletion library.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=neopixel
version=0.0.13
version=0.0.14
license=LGPLv3
author=Adafruit, Technobly
sentence=An Implementation of Adafruit's NeoPixel Library for the Spark Core, Particle Photon, P1, Electron and RedBear Duo
Expand Down
133 changes: 65 additions & 68 deletions src/neopixel.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*-------------------------------------------------------------------------
Spark Core, Particle Photon, P1, Electron and RedBear Duo library to control
WS2811/WS2812 based RGB LED devices such as Adafruit NeoPixel strips.
WS2811/WS2812/WS2813 based RGB LED devices such as Adafruit NeoPixel strips.
Supports:
- 800 KHz and 400kHz bitstream WS2813, WS2812, WS2812B and WS2811
- 800 KHz WS2812, WS2812B, WS2813 and 400kHz bitstream and WS2811
- 800 KHz bitstream SK6812RGBW (NeoPixel RGBW pixel strips)
(use 'SK6812RGBW' as PIXEL_TYPE)
Expand Down Expand Up @@ -128,12 +128,13 @@ void Adafruit_NeoPixel::show(void) {
case TM1829: { // TM1829 = 500us reset pulse
wait_time = 500L;
} break;
case WS2813: { // WS2813 = 300us reset pulse
case WS2812B: // WS2812, WS2812B & WS2813 = 300us reset pulse
case WS2812B2: {
wait_time = 300L;
} break;
case WS2812B: // WS2812 & WS2812B = 50us reset pulse
case WS2812B2:
case WS2811: // WS2811 = 50us reset pulse
case WS2811: // WS2811, WS2812B_FAST & WS2812B2_FAST = 50us reset pulse
case WS2812B_FAST:
case WS2812B2_FAST:
default: { // default = 50us reset pulse
wait_time = 50L;
} break;
Expand All @@ -157,7 +158,7 @@ void Adafruit_NeoPixel::show(void) {
b, // Current blue byte value
w; // Current white byte value

if(type == WS2812B || type == WS2813) { // same as WS2812, 800 KHz bitstream
if(type == WS2812B || type == WS2812B_FAST) { // Same as WS2812 & WS2813, 800 KHz bitstream
while(i) { // While bytes left... (3 bytes = 1 pixel)
mask = 0x800000; // reset the mask
i = i-3; // decrement bytes remaining
Expand Down Expand Up @@ -359,7 +360,7 @@ void Adafruit_NeoPixel::show(void) {
} while ( ++j < 32 ); // ... pixel done
} // end while(i) ... no more pixels
}
else if(type == WS2812B2) { // WS2812B with DWT timer
else if(type == WS2812B2 || type == WS2812B2_FAST) { // WS2812B with DWT timer
#if (PLATFORM_ID == 6) || (PLATFORM_ID == 8) || (PLATFORM_ID == 10) || (PLATFORM_ID == 88) // Photon (6), P1 (8), Electron (10) or Redbear Duo (88)
#define CYCLES_800_T0H 25 // 312ns (meas. 300ns)
#define CYCLES_800_T0L 70 // 938ns (meas. 940ns)
Expand Down Expand Up @@ -801,26 +802,27 @@ void Adafruit_NeoPixel::setPixelColor(
}
uint8_t *p = &pixels[n * 3];
switch(type) {
case WS2812B: // WS2812 & WS2812B is GRB order.
case WS2812B: // WS2812, WS2812B & WS2813 is GRB order.
case WS2812B_FAST:
case WS2812B2:
case WS2813: // WS2813 is GRB order.
*p++ = g;
*p++ = r;
*p = b;
break;
case TM1829: // TM1829 is special RBG order
if(r == 255) r = 254; // 255 on RED channel causes display to be in a special mode.
*p++ = r;
*p++ = b;
*p = g;
break;
case WS2812B2_FAST: {
*p++ = g;
*p++ = r;
*p = b;
} break;
case TM1829: { // TM1829 is special RBG order
if(r == 255) r = 254; // 255 on RED channel causes display to be in a special mode.
*p++ = r;
*p++ = b;
*p = g;
} break;
case WS2811: // WS2811 is RGB order
case TM1803: // TM1803 is RGB order
default: // default is RGB order
*p++ = r;
*p++ = g;
*p = b;
break;
default: { // default is RGB order
*p++ = r;
*p++ = g;
*p = b;
} break;
}
}
}
Expand All @@ -837,32 +839,33 @@ void Adafruit_NeoPixel::setPixelColor(
}
uint8_t *p = &pixels[n * (type==SK6812RGBW?4:3)];
switch(type) {
case WS2812B: // WS2812 & WS2812B is GRB order.
case WS2812B: // WS2812, WS2812B & WS2813 is GRB order.
case WS2812B_FAST:
case WS2812B2:
case WS2813: // WS2813 is GRB order.
*p++ = g;
*p++ = r;
*p = b;
break;
case TM1829: // TM1829 is special RBG order
if(r == 255) r = 254; // 255 on RED channel causes display to be in a special mode.
*p++ = r;
*p++ = b;
*p = g;
break;
case SK6812RGBW: // SK6812RGBW is RGBW order
*p++ = r;
*p++ = g;
*p++ = b;
*p = w;
break;
case WS2812B2_FAST: {
*p++ = g;
*p++ = r;
*p = b;
} break;
case TM1829: { // TM1829 is special RBG order
if(r == 255) r = 254; // 255 on RED channel causes display to be in a special mode.
*p++ = r;
*p++ = b;
*p = g;
} break;
case SK6812RGBW: { // SK6812RGBW is RGBW order
*p++ = r;
*p++ = g;
*p++ = b;
*p = w;
} break;
case WS2811: // WS2811 is RGB order
case TM1803: // TM1803 is RGB order
default: // default is RGB order
*p++ = r;
*p++ = g;
*p = b;
break;
default: { // default is RGB order
*p++ = r;
*p++ = g;
*p = b;
} break;
}
}
}
Expand All @@ -882,37 +885,34 @@ void Adafruit_NeoPixel::setPixelColor(uint16_t n, uint32_t c) {
}
uint8_t *p = &pixels[n * (type==SK6812RGBW?4:3)];
switch(type) {
case WS2812B: // WS2812 & WS2812B is GRB order.
case WS2812B: // WS2812, WS2812B & WS2813 is GRB order.
case WS2812B_FAST:
case WS2812B2:
case WS2813: { // WS2813 is GRB order.
case WS2812B2_FAST: {
*p++ = g;
*p++ = r;
*p = b;
}
break;
} break;
case TM1829: { // TM1829 is special RBG order
if(r == 255) r = 254; // 255 on RED channel causes display to be in a special mode.
*p++ = r;
*p++ = b;
*p = g;
}
break;
} break;
case SK6812RGBW: { // SK6812RGBW is RGBW order
uint8_t w = (uint8_t)(c >> 24);
*p++ = r;
*p++ = g;
*p++ = b;
*p = brightness ? ((w * brightness) >> 8) : w;
}
break;
} break;
case WS2811: // WS2811 is RGB order
case TM1803: // TM1803 is RGB order
default: { // default is RGB order
*p++ = r;
*p++ = g;
*p = b;
}
break;
} break;
}
}
}
Expand Down Expand Up @@ -971,26 +971,23 @@ uint32_t Adafruit_NeoPixel::getPixelColor(uint16_t n) const {
uint32_t c;

switch(type) {
case WS2812B: // WS2812 & WS2812B is GRB order.
case WS2812B: // WS2812, WS2812B & WS2813 is GRB order.
case WS2812B_FAST:
case WS2812B2:
case WS2813: { // WS2813 is GRB order.
case WS2812B2_FAST: {
c = ((uint32_t)p[1] << 16) | ((uint32_t)p[0] << 8) | (uint32_t)p[2];
}
break;
} break;
case TM1829: { // TM1829 is special RBG order
c = ((uint32_t)p[0] << 16) | ((uint32_t)p[2] << 8) | (uint32_t)p[1];
}
break;
} break;
case SK6812RGBW: { // SK6812RGBW is RGBW order, but returns packed WRGB color
c = ((uint32_t)p[0] << 24) | ((uint32_t)p[1] << 16) | ((uint32_t)p[2] << 8) | (uint32_t)p[3];
}
break;
} break;
case WS2811: // WS2811 is RGB order
case TM1803: // TM1803 is RGB order
default: { // default is RGB order
c = ((uint32_t)p[0] << 16) | ((uint32_t)p[1] << 8) | (uint32_t)p[2];
}
break;
} break;
}

// Adjust this back up to the true color, as setting a pixel color will
Expand Down
22 changes: 12 additions & 10 deletions src/neopixel.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*-------------------------------------------------------------------------
Spark Core, Particle Photon, P1, Electron and RedBear Duo library to control
WS2811/WS2812 based RGB LED devices such as Adafruit NeoPixel strips.
WS2811/WS2812/WS2813 based RGB LED devices such as Adafruit NeoPixel strips.
Supports:
- 800 KHz and 400kHz bitstream WS2813, WS2812, WS2812B and WS2811
- 800 KHz WS2812, WS2812B, WS2813 and 400kHz bitstream and WS2811
- 800 KHz bitstream SK6812RGBW (NeoPixel RGBW pixel strips)
(use 'SK6812RGBW' as PIXEL_TYPE)
Expand Down Expand Up @@ -56,14 +56,16 @@
#include "Particle.h"

// 'type' flags for LED pixels (third parameter to constructor):
#define WS2811 0x00 // 400 KHz datastream (NeoPixel)
#define WS2812 0x02 // 800 KHz datastream (NeoPixel)
#define WS2812B 0x02 // 800 KHz datastream (NeoPixel)
#define TM1803 0x03 // 400 KHz datastream (Radio Shack Tri-Color Strip)
#define TM1829 0x04 // 800 KHz datastream ()
#define WS2812B2 0x05 // 800 KHz datastream (NeoPixel)
#define SK6812RGBW 0x06 // 800 KHz datastream (NeoPixel RGBW)
#define WS2813 0x07 // 800 KHz datastream (NeoPixel)
#define WS2811 0x00 // 400 KHz datastream (NeoPixel)
#define WS2812 0x02 // 800 KHz datastream (NeoPixel)
#define WS2812B 0x02 // 800 KHz datastream (NeoPixel)
#define WS2813 0x02 // 800 KHz datastream (NeoPixel)
#define TM1803 0x03 // 400 KHz datastream (Radio Shack Tri-Color Strip)
#define TM1829 0x04 // 800 KHz datastream ()
#define WS2812B2 0x05 // 800 KHz datastream (NeoPixel)
#define SK6812RGBW 0x06 // 800 KHz datastream (NeoPixel RGBW)
#define WS2812B_FAST 0x07 // 800 KHz datastream (NeoPixel)
#define WS2812B2_FAST 0x08 // 800 KHz datastream (NeoPixel)

class Adafruit_NeoPixel {

Expand Down

0 comments on commit 29c8b96

Please sign in to comment.