interfisch
/
Adalight-FastLED_rgbwMod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed settings to use constants 

For type safety
This commit is contained in:
David Madison 2017-03-19 15:04:36 -04:00
parent 6b25599580
commit 090532f841
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Arduino/LEDstream_FastLED/LEDstream_FastLED.ino
View File

@ -4,22 +4,23 @@
* library (http://fastled.io) for driving led strips. * library (http://fastled.io) for driving led strips.
* *
* http://github.com/dmadison/Adalight-FastLED * http://github.com/dmadison/Adalight-FastLED
* Last Updated: 2016-12-21 * Last Updated: 2017-03-19
*/ */
// -- General Settings // -- General Settings
#define NUM_LEDS 80 // strip length static const uint8_t Num_Leds = 80; // strip length
#define LED_PIN 6 // Arduino data output pin static const uint8_t Led_Pin = 6; // Arduino data output pin
#define BRIGHTNESS 255 // maximum brightness static const uint8_t Brightness = 255; // maximum brightness
// --- FastLED Setings // --- FastLED Setings
#define LED_TYPE WS2812B // led strip type for FastLED #define LED_TYPE WS2812B // led strip type for FastLED
#define COLOR_ORDER GRB // color order for bitbang #define COLOR_ORDER GRB // color order for bitbang
// --- Serial Settings // --- Serial Settings
#define SPEED 115200 // serial port speed, max available static const unsigned long
SerialSpeed = 115200; // serial port speed, max available
static const unsigned long // time before LEDs are shut off, if no data static const unsigned long // time before LEDs are shut off, if no data
serialTimeout = 150000; // 150 seconds SerialTimeout = 150000; // 150 seconds
// -- Optional Settings (uncomment to add) // -- Optional Settings (uncomment to add)
//#define GROUND_PIN 10 // additional grounding pin (optional) //#define GROUND_PIN 10 // additional grounding pin (optional)
@ -29,7 +30,7 @@ static const unsigned long // time before LEDs are shut off, if no data
#include <FastLED.h> #include <FastLED.h>
CRGB leds[NUM_LEDS]; CRGB leds[Num_Leds];
uint8_t * ledsRaw = (uint8_t *)leds; uint8_t * ledsRaw = (uint8_t *)leds;
// A 'magic word' (along with LED count & checksum) precedes each block // A 'magic word' (along with LED count & checksum) precedes each block
@ -60,10 +61,10 @@ void setup(){
digitalWrite(GROUND_PIN, LOW); digitalWrite(GROUND_PIN, LOW);
#endif #endif
FastLED.addLeds<LED_TYPE, LED_PIN, COLOR_ORDER>(leds, NUM_LEDS); FastLED.addLeds<LED_TYPE, Led_Pin, COLOR_ORDER>(leds, Num_Leds);
FastLED.setBrightness(BRIGHTNESS); FastLED.setBrightness(Brightness);
Serial.begin(SPEED); Serial.begin(SerialSpeed);
adalight(); adalight();
} }
@ -119,8 +120,8 @@ void adalight(){
lastAckTime = t; // Reset counter lastAckTime = t; // Reset counter
} }
// If no data received for an extended time, turn off all LEDs. // If no data received for an extended time, turn off all LEDs.
if((t - lastByteTime) > serialTimeout) { if((t - lastByteTime) > SerialTimeout) {
memset(leds, 0, NUM_LEDS * sizeof(struct CRGB)); //filling Led array by zeroes memset(leds, 0, Num_Leds * sizeof(struct CRGB)); //filling Led array by zeroes
FastLED.show(); FastLED.show();
lastByteTime = t; // Reset counter lastByteTime = t; // Reset counter
} }
@ -145,7 +146,7 @@ void adalight(){
bytesRemaining = 3L * (256L * (long)hi + (long)lo + 1L); bytesRemaining = 3L * (256L * (long)hi + (long)lo + 1L);
bytesBuffered -= 3; bytesBuffered -= 3;
outPos = 0; outPos = 0;
memset(leds, 0, NUM_LEDS * sizeof(struct CRGB)); memset(leds, 0, Num_Leds * sizeof(struct CRGB));
mode = MODE_DATA; // Proceed to latch wait mode mode = MODE_DATA; // Proceed to latch wait mode
} }
else { else {