-// Neopixel Salt Lamp v1.0
+
+// Neopixel Salt Lamp v1.2
 // By Chris Barrett - Polaris Interplanetary - Special Projects Division
 // Supports two modes; All pixel colour fade, and 8 pixel RGB mixer. All modes are asynchronous, and compartmentalized into functions.
+// January 2016 - Shimmer has been overhauled. Cleaner, faster and more productive. NO MORE MID FADE FLICKER! 
+//              - Still needs collision detection.
 
 #include <Adafruit_NeoPixel.h>
 #include <avr/power.h>
+#include <Encoder.h>
 
 // Which pin on the Arduino is connected to the NeoPixels?
-// On a Trinket or Gemma we suggest changing this to 1
 #define PIN            6
 
-// How many NeoPixels are attached to the Arduino?
+// what address are the pixels going to range? This was helpful in prototyping because I could use a long strip of lights and only address the last few and stick them in the salt crystal.
 #define NUMPIXELS      133
-#define LOWPIXELS      87
+#define LOWPIXELS      83
 
 
 

    }
    
    
    potVal = analogRead(potPin);                    //determine delay
    potVal = map(potVal, 0, 1024, 0, 500);
    
    
    for(int i=LOWPIXELS;i<NUMPIXELS;i++){
        pixels.setPixelColor(i, pixels.Color(rval,gval,bval));

// example for more information on possible values.
Adafruit_NeoPixel pixels = Adafruit_NeoPixel(NUMPIXELS, PIN, NEO_GRB + NEO_KHZ800);

Encoder myEnc(2, 3);
int butpin = 5;                                     // integer to store button pin
int butval;                                         // Button digital read variable
int butsel = 2;                                     // Button mode selection variable.
int butbounce;                                      // button debounce
int rcount;                                         // Counter for red
int gcount;                                         // Counter for green
int bcount;                                         // Counter for blue
