LED effect updates

cRGB.h

@@ -22,7 +22,7 @@ x from 0 - 255 : y = round(pow( 2.0, x+64/40.0) - 1)
 */
 
 // uncomment this line if you use HSV is many projects
-// #define USE_HSV
+#define USE_HSV
 
 #ifdef USE_HSV
 const byte dim_curve[] = {

led_control.cpp

@@ -3,12 +3,16 @@
 cRGB value;
 WS2812 LED(LED_COUNT);
 
+#define USE_HSV
+
 int led_mode;
 int last_led_mode;
-int pos=0;
+int pos = 0;
 cRGB led_off;
 
 
+
+
 cRGB led_steady;
 cRGB led_blue;
 cRGB led_dark_blue;
@@ -16,50 +20,66 @@ cRGB led_dark_blue;
 
 cRGB led_breathe;
 
+// Begin RGB Stuff
+cRGB rainbow;
+int rainbow_hue = 0;   //stores 0 to 614
+byte rainbow_steps = 1; //number of hues we skip in a 360 range per update
+
+byte rainbow_saturation = 255;
+byte rainbow_value = 190;
+
+long rainbow_ticks = 5; //delays between update
+long rainbow_current_ticks =0;
+int breathe_brightness = 0;    // how bright the LED is
+int breathe_fadeAmount = 1;    // how many points to fade the LED by
+
+int chase_pixels = 1;
+int chase_threshold = 6;
+int current_chase_counter = 0;
+
+// End RGB stuff
 
 void setup_leds() {
-led_off.r=0;
+  led_off.r = 0;
-led_off.g=0;
+  led_off.g = 0;
-led_off.b=0;
+  led_off.b = 0;
-led_steady.r=160;
+  led_steady.r = 0;
-led_steady.g=160;
+  led_steady.g = 255;
-led_steady.b=160;
+  led_steady.b = 0;
-led_blue.r=0;
+  led_blue.r = 0;
-led_blue.g=0;
+  led_blue.g = 0;
-led_blue.b=255;
+  led_blue.b = 255;
+
+  led_dark_blue.r = 0;
+  led_dark_blue.g = 0;
+  led_dark_blue.b = 127;
+
 
-led_dark_blue.r=0;
-led_dark_blue.g=0;
-led_dark_blue.b=127;
 
 
   LED.setOutput(LED_DATA_PIN);
-	LED.setColorOrderRGB();  // Uncomment for RGB color order
+  LED.setColorOrderGRB();  // Uncomment for RGB color order
-    led_mode=LED_MODE_STEADY;
+  led_mode = LED_MODE_RAINBOW;
 }
 
 byte key_to_led(byte row, byte col) {
   return key_led_map[row][col];
 }
 
-void set_key_color(byte row, byte col, cRGB color){
+void set_key_color(byte row, byte col, cRGB color) {
-    LED.set_crgb_at(key_to_led(row,col),color);
+  LED.set_crgb_at(key_to_led(row, col), color);
 }
 
-cRGB get_key_color(byte row, byte col){
+cRGB get_key_color(byte row, byte col) {
-    return LED.get_crgb_at(key_to_led(row,col));
+  return LED.get_crgb_at(key_to_led(row, col));
 }
 
 
-  void update_leds_rgb(){
-			//LED.set_crgb_at(i, value); // Set value at LED found at index 0
-	LED.sync(); // Sends the data to the LEDs
-
-	}
 
 void initialize_led_mode(int mode) {
-    if (mode == LED_MODE_OFF) {
   set_all_leds_to(led_off);
+  if (mode == LED_MODE_OFF) {
+    //        set_all_leds_to(led_off);
   } else if (mode == LED_MODE_HEATMAP) {
   } else if (mode == LED_MODE_BREATHE) {
 
@@ -71,17 +91,28 @@ void initialize_led_mode(int mode) {
 }
 
 void set_all_leds_to(cRGB color) {
-        for(int i=0; i<LED_COUNT;i++) {
+  for (int i = 0; i < LED_COUNT; i++) {
-            LED.set_crgb_at(i,color);
+    LED.set_crgb_at(i, color);
   }
 
 }
 
-int brightness = 0;    // how bright the LED is
+
-int fadeAmount = 1;    // how many points to fade the LED by
+void next_led_mode() {
-int chase_pixels = 1;
+  led_mode++;
-int chase_threshold = 6;
+  if (led_mode >= LED_MODES) {
-int current_chase_counter=0;
+    led_mode = 0;
+  }
+}
+
+void set_led_mode(int mode) {
+  led_mode = mode;
+
+}
+
+
+
+
 void update_leds() {
   if (led_mode != last_led_mode) {
     initialize_led_mode(led_mode);
@@ -89,45 +120,101 @@ void update_leds() {
   if (led_mode == LED_MODE_OFF) {
   } else if (led_mode == LED_MODE_HEATMAP) {
   } else if (led_mode == LED_MODE_BREATHE) {
+    led_effect_breathe_update();
+
+
+
+  } else if (led_mode == LED_MODE_RAINBOW) {
+
+
+    led_effect_rainbow_update();
+
+
+
+  } else if (led_mode == LED_MODE_CHASE) {
+
+    led_effect_chase_update();
+
+
+  } else if (led_mode == LED_MODE_STEADY) {
+    led_effect_steady_update();
+    
+  
+  }
+
+  last_led_mode = led_mode;
+}
+
+
+
+  void led_effect_steady_update() {
+    LED.sync();
+    }
+
+
+void led_effect_breathe_update() {
   // algorithm from http://sean.voisen.org/blog/2011/10/breathing-led-with-arduino/
-      //  int brightness =  (exp(sin(millis()/2000.0*PI)) - 0.36787944)*108.0;
+  breathe_brightness =  (exp(sin(millis()/2000.0*PI)) - 0.36787944)*108.0;
   // change the brightness for next time through the loop:
-  brightness = brightness + fadeAmount;
+  //breathe_brightness = breathe_brightness + breathe_fadeAmount;
 
   // reverse the direction of the fading at the ends of the fade:
-  if (brightness == 0 || brightness == 160) {
+  if (breathe_brightness == 0 || breathe_brightness == 150) {
-    fadeAmount = -fadeAmount ; 
+    breathe_fadeAmount = -breathe_fadeAmount ;
   }
 
 
 
-        led_breathe.r=brightness;
+  led_breathe.r = breathe_brightness * 0;
-        led_breathe.g=brightness;
+  led_breathe.g = breathe_brightness *0.5;
-        led_breathe.b=brightness;
+  led_breathe.b = breathe_brightness * 0;
   set_all_leds_to(led_breathe);
   LED.sync();
+}
 
-    } else if (led_mode == LED_MODE_RAINBOW) {
+void 
-    } else if (led_mode == LED_MODE_CHASE) {
+led_effect_chase_update() {
-      if(current_chase_counter++<chase_threshold) {
+  if (current_chase_counter++ < chase_threshold) {
     return;
   }
-      current_chase_counter=0;
+  current_chase_counter = 0;
-      LED.set_crgb_at(pos-chase_pixels,led_off);
+  LED.set_crgb_at(pos - chase_pixels, led_off);
-      LED.set_crgb_at(pos,led_dark_blue);
+  LED.set_crgb_at(pos, led_dark_blue);
 
-      pos+=chase_pixels;
+  pos += chase_pixels;
-      if (pos>LED_COUNT||pos<0) {
+  if (pos > LED_COUNT || pos < 0) {
     chase_pixels = -chase_pixels;
-    pos+=chase_pixels;
+    pos += chase_pixels;
 
   }
-      LED.set_crgb_at(pos,led_blue);
+  LED.set_crgb_at(pos, led_blue);
   LED.sync();
+}
 
-    } else if (led_mode == LED_MODE_STEADY) {
-        LED.sync();
-    }
 
-        last_led_mode = led_mode;
+
+
+
+
+
+void led_effect_rainbow_update() {
+  
+  
+  if (rainbow_current_ticks++ < rainbow_ticks) {
+     return; 
+  } else { rainbow_current_ticks = 0; }
+
+  rainbow.SetHSV(rainbow_hue, rainbow_saturation, rainbow_value);
+
+  rainbow_hue += rainbow_steps;
+  if (rainbow_hue > 360)          {
+    rainbow_hue %= 360;
+  }
+  set_all_leds_to(rainbow);
+  LED.sync();
 }
+
+
+
+
+

led_control.h

@@ -28,10 +28,23 @@ void setup_leds();
 void update_leds();
 void set_all_leds_to(cRGB color);
 
-
+void set_led_mode(int mode);
+void next_led_mode();
 
 byte key_to_led(byte row, byte col);
 void set_key_color(byte row, byte col);
 cRGB get_key_color(byte row, byte col);
 
+void led_effect_breathe_init();
+void led_effect_rainbow_init();
+void led_effect_chase_init();
+void led_effect_steady_init();
+void led_Effect_heatmap_init();
+
+void led_effect_breathe_update();
+void led_effect_rainbow_update();
+void led_effect_chase_update();
+void led_effect_steady_update();
+void led_Effect_heatmap_update();
+
 #endif