From 090532f841edf82afc6f1983bac2b8beff0e781a Mon Sep 17 00:00:00 2001
From: David Madison <dmadison@users.noreply.github.com>
Date: Sun, 19 Mar 2017 15:04:36 -0400
Subject: [PATCH] Changed settings to use constants

For type safety
---
 .../LEDstream_FastLED/LEDstream_FastLED.ino   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

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