diff options
author | Daniel Garcia <danielgarcia@gmail.com> | 2015-03-11 06:47:10 +0300 |
---|---|---|
committer | Daniel Garcia <danielgarcia@gmail.com> | 2015-03-11 06:47:10 +0300 |
commit | f91fef7bc46aeb0f45fb78f82cdcc49aa533a472 (patch) | |
tree | 175aa5dadca09ade7b5b23008f0aae030222fcf6 /examples | |
parent | 6ad63e510297473282b74745537defef887bbf34 (diff) | |
parent | c0c8f765f1b01655116cc0c95979203ba05c80ef (diff) |
fixing merge conflicts
Diffstat (limited to 'examples')
-rw-r--r-- | examples/Cylon/Cylon.ino | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/Cylon/Cylon.ino b/examples/Cylon/Cylon.ino index 76046b41..288d3ee8 100644 --- a/examples/Cylon/Cylon.ino +++ b/examples/Cylon/Cylon.ino @@ -15,7 +15,7 @@ CRGB leds[NUM_LEDS]; void setup() { Serial.begin(57600); Serial.println("resetting"); - LEDS.addLeds<NEOPIXEL,DATA_PIN>(leds,NUM_LEDS); + LEDS.addLeds<APA102,2,1,RGB>(leds,NUM_LEDS); LEDS.setBrightness(84); } |