diff options
author | Martin Falatic <martin@falatic.com> | 2019-09-03 10:51:03 +0300 |
---|---|---|
committer | Martin Falatic <martin@falatic.com> | 2020-01-08 06:55:18 +0300 |
commit | 22339d873defdc317b988dc3a536143bd4443325 (patch) | |
tree | d7857cd7347181696c64aa64db0847c9026f14a4 | |
parent | e559fcd1176c901a7c3d1a8ad48a5a77d5702491 (diff) |
Make examples consistent and document the likely non-RGB types
Resolves #878, #877, #928
-rw-r--r-- | examples/Blink/Blink.ino | 71 | ||||
-rw-r--r-- | examples/FirstLight/FirstLight.ino | 78 | ||||
-rw-r--r-- | examples/RGBCalibrate/RGBCalibrate.ino | 63 |
3 files changed, 132 insertions, 80 deletions
diff --git a/examples/Blink/Blink.ino b/examples/Blink/Blink.ino index 33648694..443896ec 100644 --- a/examples/Blink/Blink.ino +++ b/examples/Blink/Blink.ino @@ -3,9 +3,10 @@ // How many leds in your strip? #define NUM_LEDS 1 -// For led chips like Neopixels, which have a data line, ground, and power, you just +// For led chips like WS2812, which have a data line, ground, and power, you just // need to define DATA_PIN. For led chipsets that are SPI based (four wires - data, clock, // ground, and power), like the LPD8806 define both DATA_PIN and CLOCK_PIN +// Clock pin only needed for SPI based chipsets when not using hardware SPI #define DATA_PIN 3 #define CLOCK_PIN 13 @@ -13,33 +14,47 @@ CRGB leds[NUM_LEDS]; void setup() { - // Uncomment/edit one of the following lines for your leds arrangement. - // FastLED.addLeds<TM1803, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<TM1804, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<TM1809, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<WS2811, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<WS2812, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<WS2812B, DATA_PIN, RGB>(leds, NUM_LEDS); - FastLED.addLeds<NEOPIXEL, DATA_PIN>(leds, NUM_LEDS); - // FastLED.addLeds<APA104, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<UCS1903, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<UCS1903B, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<GW6205, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<GW6205_400, DATA_PIN, RGB>(leds, NUM_LEDS); - - // FastLED.addLeds<WS2801, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<SM16716, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<LPD8806, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<P9813, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<APA102, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<DOTSTAR, RGB>(leds, NUM_LEDS); - - // FastLED.addLeds<WS2801, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<SM16716, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<LPD8806, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<P9813, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<APA102, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<DOTSTAR, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); + // Uncomment/edit one of the following lines for your leds arrangement. + // ## Clockless types ## + FastLED.addLeds<NEOPIXEL, DATA_PIN>(leds, NUM_LEDS); // GRB ordering is assumed + // FastLED.addLeds<SM16703, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1829, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1812, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1809, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1804, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1803, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<UCS1903, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<UCS1903B, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<UCS1904, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<UCS2903, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<WS2812, DATA_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<WS2852, DATA_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<WS2812B, DATA_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<GS1903, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<SK6812, DATA_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<SK6822, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<APA106, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<PL9823, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<SK6822, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<WS2811, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<WS2813, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<APA104, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<WS2811_400, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<GE8822, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<GW6205, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<GW6205_400, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<LPD1886, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<LPD1886_8BIT, DATA_PIN, RGB>(leds, NUM_LEDS); + // ## Clocked (SPI) types ## + // FastLED.addLeds<LPD6803, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<LPD8806, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<WS2801, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<WS2803, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<SM16716, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<P9813, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // BGR ordering is typical + // FastLED.addLeds<DOTSTAR, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // BGR ordering is typical + // FastLED.addLeds<APA102, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // BGR ordering is typical + // FastLED.addLeds<SK9822, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // BGR ordering is typical } void loop() { diff --git a/examples/FirstLight/FirstLight.ino b/examples/FirstLight/FirstLight.ino index 9f561b08..8eaf4e23 100644 --- a/examples/FirstLight/FirstLight.ino +++ b/examples/FirstLight/FirstLight.ino @@ -14,11 +14,12 @@ // How many leds are in the strip? #define NUM_LEDS 60 -// Data pin that led data will be written out over -#define DATA_PIN 3 - +// For led chips like WS2812, which have a data line, ground, and power, you just +// need to define DATA_PIN. For led chipsets that are SPI based (four wires - data, clock, +// ground, and power), like the LPD8806 define both DATA_PIN and CLOCK_PIN // Clock pin only needed for SPI based chipsets when not using hardware SPI -//#define CLOCK_PIN 8 +#define DATA_PIN 3 +#define CLOCK_PIN 13 // This is an array of leds. One item for each led in your strip. CRGB leds[NUM_LEDS]; @@ -28,34 +29,47 @@ void setup() { // sanity check delay - allows reprogramming if accidently blowing power w/leds delay(2000); - // Uncomment one of the following lines for your leds arrangement. - // FastLED.addLeds<TM1803, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<TM1804, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<TM1809, DATA_PIN, RGB>(leds, NUM_LEDS); - FastLED.addLeds<WS2811, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<WS2812, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<WS2812B, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<NEOPIXEL, DATA_PIN>(leds, NUM_LEDS); - // FastLED.addLeds<APA104, DATA_PIN>(leds, NUM_LEDS); - // FastLED.addLeds<WS2811_400, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<GW6205, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<GW6205_400, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<UCS1903, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<UCS1903B, DATA_PIN, RGB>(leds, NUM_LEDS); - - // FastLED.addLeds<WS2801, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<SM16716, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<LPD8806, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<P9813, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<APA102, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<DOTSTAR, RGB>(leds, NUM_LEDS); - - // FastLED.addLeds<WS2801, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<SM16716, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<LPD8806, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<P9813, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<APA102, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<DOTSTAR, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); + // Uncomment/edit one of the following lines for your leds arrangement. + // ## Clockless types ## + // FastLED.addLeds<NEOPIXEL, DATA_PIN>(leds, NUM_LEDS); // GRB ordering is assumed + // FastLED.addLeds<SM16703, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1829, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1812, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1809, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1804, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1803, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<UCS1903, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<UCS1903B, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<UCS1904, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<UCS2903, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<WS2812, DATA_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<WS2852, DATA_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<WS2812B, DATA_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<GS1903, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<SK6812, DATA_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<SK6822, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<APA106, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<PL9823, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<SK6822, DATA_PIN, RGB>(leds, NUM_LEDS); + FastLED.addLeds<WS2811, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<WS2813, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<APA104, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<WS2811_400, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<GE8822, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<GW6205, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<GW6205_400, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<LPD1886, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<LPD1886_8BIT, DATA_PIN, RGB>(leds, NUM_LEDS); + // ## Clocked (SPI) types ## + // FastLED.addLeds<LPD6803, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<LPD8806, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<WS2801, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<WS2803, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<SM16716, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<P9813, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // BGR ordering is typical + // FastLED.addLeds<DOTSTAR, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // BGR ordering is typical + // FastLED.addLeds<APA102, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // BGR ordering is typical + // FastLED.addLeds<SK9822, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // BGR ordering is typical } // This function runs over and over, and is where you do the magic to light diff --git a/examples/RGBCalibrate/RGBCalibrate.ino b/examples/RGBCalibrate/RGBCalibrate.ino index 72e21507..5ff33805 100644 --- a/examples/RGBCalibrate/RGBCalibrate.ino +++ b/examples/RGBCalibrate/RGBCalibrate.ino @@ -23,12 +23,14 @@ // ////////////////////////////////////////////////// -#define NUM_LEDS 6 +#define NUM_LEDS 7 -// Data pin that led data will be written out over -#define DATA_PIN 6 +// For led chips like WS2812, which have a data line, ground, and power, you just +// need to define DATA_PIN. For led chipsets that are SPI based (four wires - data, clock, +// ground, and power), like the LPD8806 define both DATA_PIN and CLOCK_PIN // Clock pin only needed for SPI based chipsets when not using hardware SPI -//#define CLOCK_PIN 8 +#define DATA_PIN 3 +#define CLOCK_PIN 13 CRGB leds[NUM_LEDS]; @@ -36,27 +38,48 @@ void setup() { // sanity check delay - allows reprogramming if accidently blowing power w/leds delay(2000); - // Uncomment one of the following lines for your leds arrangement. - // FastLED.addLeds<TM1803, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<TM1804, DATA_PIN, RGB>(leds, NUM_LEDS); + // Uncomment/edit one of the following lines for your leds arrangement. + // ## Clockless types ## + // FastLED.addLeds<SM16703, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1829, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1812, DATA_PIN, RGB>(leds, NUM_LEDS); // FastLED.addLeds<TM1809, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1804, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<TM1803, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<UCS1903, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<UCS1903B, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<UCS1904, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<UCS2903, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<WS2812, DATA_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<WS2852, DATA_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<WS2812B, DATA_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<GS1903, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<SK6812, DATA_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<SK6822, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<APA106, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<PL9823, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<SK6822, DATA_PIN, RGB>(leds, NUM_LEDS); // FastLED.addLeds<WS2811, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<WS2812, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<WS2812B, DATA_PIN, GRB>(leds, NUM_LEDS); - // FastLED.setBrightness(CRGB(255,255,255)); + // FastLED.addLeds<WS2813, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<APA104, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<WS2811_400, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<GE8822, DATA_PIN, RGB>(leds, NUM_LEDS); // FastLED.addLeds<GW6205, DATA_PIN, RGB>(leds, NUM_LEDS); // FastLED.addLeds<GW6205_400, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<UCS1903, DATA_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<UCS1903B, DATA_PIN, RGB>(leds, NUM_LEDS); - - // FastLED.addLeds<WS2801, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<SM16716, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<LPD8806, 9, 10, RGB>(leds, NUM_LEDS); - FastLED.addLeds<LPD6803, RGB>(leds, NUM_LEDS); - + // FastLED.addLeds<LPD1886, DATA_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<LPD1886_8BIT, DATA_PIN, RGB>(leds, NUM_LEDS); + // ## Clocked (SPI) types ## + // FastLED.addLeds<LPD6803, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical + // FastLED.addLeds<LPD8806, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // GRB ordering is typical // FastLED.addLeds<WS2801, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<WS2803, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // FastLED.addLeds<SM16716, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); - // FastLED.addLeds<LPD8806, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); + // FastLED.addLeds<P9813, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // BGR ordering is typical + // FastLED.addLeds<DOTSTAR, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // BGR ordering is typical + // FastLED.addLeds<APA102, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // BGR ordering is typical + // FastLED.addLeds<SK9822, DATA_PIN, CLOCK_PIN, RGB>(leds, NUM_LEDS); // BGR ordering is typical + + // FastLED.setBrightness(CRGB(255,255,255)); } void loop() { @@ -69,4 +92,4 @@ void loop() { leds[6] = CRGB(0,0,0); FastLED.show(); delay(1000); -}
\ No newline at end of file +} |