Added RGB mode

firmware/rgbfill/buttons.ino

@@ -35,11 +35,42 @@ void handleButtonLogic() {
     delay(50);
 
   } else if (modePressed) {
+    HandleModeButtonPress();
+    while (digitalRead(BUTTON_MODE) == LOW) {
+      //Wait for button up before continue
+      delay(BUTTON_HOLD_DELAY);
+    }
+    //Debounce
+    delay(50);
+  }
+
+}
 
+//Mode button is pressed
+void HandleModeButtonPress() {
+  //Update the mode number
+  currentMode += 1;
+  if (currentMode > 3) {
+    currentMode = 0;
+  }
+
+  //Current mode updated
+  //Reset the RGB values to default of each modes
+  if (currentMode == 0) {
+    Serial.println("Switched to White Balanced Mode");
+    loadWhiteModeDefault();
+  } else if (currentMode == 1) {
+    Serial.println("Switched to RGB Mode");
+    loadRGBModeDefault();
+  } else if (currentMode == 2) {
+    Serial.println("Switched to Color Palette Mode");
+  } else if (currentMode == 3) {
+    Serial.println("Switched to Preset Mode");
   }
 
 }
 
+//Color button is pressed
 void HandleColorButtonPress() {
   if (currentMode == 0) {
     //White mode
@@ -52,6 +83,21 @@ void HandleColorButtonPress() {
       //Set control LED to white
       setControlLEDColor(MAX_CTRLBRIGHTNESS, MAX_CTRLBRIGHTNESS, MAX_CTRLBRIGHTNESS);
     }
+  } else if (currentMode == 1) {
+    if (adjustingCatergory == 0) {
+      //Red -> Green
+      adjustingCatergory = 1;
+      setControlLEDColor(0, MAX_CTRLBRIGHTNESS, 0);
+    } else if (adjustingCatergory == 1) {
+      //Green -> Blue
+      adjustingCatergory = 2;
+      setControlLEDColor(0, 0, MAX_CTRLBRIGHTNESS);
+    } else if (adjustingCatergory == 2) {
+      //Blue -> Red
+      adjustingCatergory = 0;
+      //Set LED to yellow for brightness
+      setControlLEDColor(MAX_CTRLBRIGHTNESS, 0, 0);
+    }
   }
 }
 
@@ -63,6 +109,7 @@ void HandleAddButtonPress() {
       values[0] = values[0] + 100;
       if (values[0] > 10000) {
         values[0] = 10000;
+        blinkUpperLimit();
       }
       Serial.print("Updating color temperature to ");
       Serial.println(values[0]);
@@ -70,11 +117,14 @@ void HandleAddButtonPress() {
       values[1] += 1;
       if (values[1] > MAX_BRIGHTNESS) {
         values[1] = MAX_BRIGHTNESS;
+        blinkUpperLimit();
       }
       Serial.print("Updating brightness to ");
       Serial.println(values[1]);
     }
     setColorTemperature(values[0], values[1]);
+  } else if (currentMode == 1) {
+    handleRGBModeAdd();
   }
 }
 
@@ -86,6 +136,7 @@ void HandleMinusButtonPress() {
       values[0] = values[0] - 100;
       if (values[0] < 1500) {
         values[0] = 1500;
+        blinkLowerLimit();
       }
 
       Serial.print("Updating color temperature to ");
@@ -94,10 +145,13 @@ void HandleMinusButtonPress() {
       values[1] -= 1;
       if (values[1] < 0) {
         values[1] = 0;
+        blinkLowerLimit();
       }
       Serial.print("Updating brightness to ");
       Serial.println(values[1]);
     }
     setColorTemperature(values[0], values[1]);
+  } else if (currentMode == 1) {
+    handleRGBModeMinus();
   }
 }

firmware/rgbfill/led_utils.ino

@@ -0,0 +1,21 @@
+void blinkUpperLimit() {
+  int originalRGB[] = {currentCtrlLedRgb[0], currentCtrlLedRgb[1], currentCtrlLedRgb[2]};
+  for (int i = 0; i < 5; i++) {
+    setControlLEDColor(MAX_CTRLBRIGHTNESS, MAX_CTRLBRIGHTNESS / 4, MAX_CTRLBRIGHTNESS / 4);
+    delay(100);
+    setControlLEDColor(0, 0, 0);
+    delay(100);
+  }
+  setControlLEDColor(originalRGB[0], originalRGB[1], originalRGB[2]);
+}
+
+void blinkLowerLimit() {
+  int originalRGB[] = {currentCtrlLedRgb[0], currentCtrlLedRgb[1], currentCtrlLedRgb[2]};
+  for (int i = 0; i < 5; i++) {
+    setControlLEDColor(MAX_CTRLBRIGHTNESS/4, MAX_CTRLBRIGHTNESS / 4, MAX_CTRLBRIGHTNESS);
+    delay(100);
+    setControlLEDColor(0, 0, 0);
+    delay(100);
+  }
+  setControlLEDColor(originalRGB[0], originalRGB[1], originalRGB[2]);
+}

firmware/rgbfill/lib/tempcolor.cpp

@@ -1,98 +0,0 @@
-// tempcolor.cpp
-// Travis Llado, 2016
-
-// Temp.Color converts light temperatures from 1000K to
-// 40,000K, as well as desired brightness, into light
-// color codes for WS2812 LEDs.
-// Conversion data is provided by Mitch Charity at Vendian.
-// (http://www.vendian.org/mncharity/dir3/blackbody/)
-
-#include "tempcolor.h"
-
-tempClass temp;
-
-// color
-// Accepts two values (for temperature and brightness) and
-// returns the corresponding neopixel color code (32b int)
-uint32_t tempClass::color(double T, double brite) {
-  if(brite >= 0.0 && brite <= 1.0) {
-    uint8_t Red = R(T)*brite;
-    uint8_t Grn = G(T)*brite;
-    uint8_t Blu = B(T)*brite;
-
-    if(format == rgb)
-      return (uint32_t)Red << 16 | (uint32_t)Grn <<  8 | Blu;
-    else
-      return (uint32_t)Grn << 16 | (uint32_t)Red <<  8 | Blu;
-  }
-  return 0;
-}
-
-void tempClass::RGB() {
-  format = rgb;
-}
-
-void tempClass::GRB() {
-  format = grb;
-}
-
-uint8_t tempClass::R(double T) {
-  if(T >= -1.0) {
-    if(T <= 0.0)
-      return 255*(1);
-    if(T <= 1.0)
-      return 255*(-0.990*T*T*T + 2.34*T*T - 1.99*T + 0.970);
-  }
-  return 0;
-}
-
-uint8_t tempClass::G(double T) {
-  if(T >= -1.0) {
-    if(T <= 0.0)
-      return 255*(-0.402*T*T*T - 0.211*T*T + 1.09*T + 0.958);
-    if(T <= 1.0)
-      return 255*(-0.542*T*T*T + 1.37*T*T - 1.28*T + 0.941);
-  }
-  return 0;
-}
-
-uint8_t tempClass::B(double T) {
-  if(T >= -1.0) {
-    if(T <= -0.7)
-      return 255*(0);
-    if(T <= 0.0)
-      return 255*(0.0117*T*T*T + 2.05*T*T + 2.85*T + 1.00);
-    if(T <= 1.0)
-      return 255*(1);
-  }
-  return 0;
-}
-
-// overloaded functions so user can give color and brightness
-// as either double or int
-uint32_t tempClass::color(double T, int brite) {
-  double f_brite = (double)brite / 255.0;
-  return color(T,f_brite);
-}
-
-uint32_t tempClass::color(int T, double brite) {
-  double f_T = (log(T) - 8.79) / 1.8;
-  return color(f_T,brite);
-}
-
-uint32_t tempClass::color(long int T, double brite) {
-  double f_T = (log(T) - 8.79) / 1.8;
-  return color(f_T,brite);
-}
-
-uint32_t tempClass::color(int T, int brite) {
-  double f_T = (log(T) - 8.79) / 1.8;
-  double f_brite = (double)brite / 255.0;
-  return color(f_T,f_brite);
-}
-
-uint32_t tempClass::color(long int T, int brite) {
-  double f_T = (log(T) - 8.79) / 1.8;
-  double f_brite = (double)brite / 255.0;
-  return color(f_T,f_brite);
-}

firmware/rgbfill/lib/tempcolor.h

@@ -1,37 +0,0 @@
-// tempcolor.h
-// Travis Llado, 2016
-
-// Temp.Color converts light temperatures from 1000K to
-// 40,000K, as well as desired brightness, into light
-// color codes for WS2812 LEDs.
-// Conversion data is provided by Mitch Charity at Vendian.
-// (http://www.vendian.org/mncharity/dir3/blackbody/)
-
-#ifndef TEMPCOLOR_H
-#define TEMPCOLOR_H
-
-#include "Arduino.h"
-
-#define rgb 0
-#define grb 1
-
-class tempClass {
-  public:
-  uint32_t color(double temp, double brightness);
-  uint32_t color(double temp, int brightness);
-  uint32_t color(int temp, double brightness);
-  uint32_t color(long int temp, double brightness);
-  uint32_t color(int temp, int brightness);
-  uint32_t color(long int temp, int brightness);
-  void RGB();
-  void GRB();
-  private:
-  uint8_t R(double);
-  uint8_t G(double);
-  uint8_t B(double);
-  bool format;
-};
-
-extern tempClass temp;
-
-#endif

firmware/rgbfill/mode_rgb.ino

@@ -0,0 +1,92 @@
+//Load the default runtime for RGB Mode
+void loadRGBModeDefault() {
+  values[0] = MAX_BRIGHTNESS; //R
+  values[1] = MAX_BRIGHTNESS; //G
+  values[2] = MAX_BRIGHTNESS; //B
+  adjustingCatergory = 0;
+
+  //Set current controlling to red
+  setControlLEDColor(MAX_CTRLBRIGHTNESS, 0, 0);
+
+  //Set LED color to white
+  setLightColor(values[0], values[1], values[2]);
+}
+
+//Handlers for add / minus button
+void handleRGBModeAdd() {
+  switch (adjustingCatergory) {
+    case 0:
+      //Red
+      values[0] += 2;
+      if (values[0] > 255) {
+        values[0] = 255;
+        blinkUpperLimit();
+      }
+      break;
+    case 1:
+      //Green
+      values[1] += 2;
+      if (values[1] > 255) {
+        values[1] = 255;
+        blinkUpperLimit();
+      }
+      break;
+    case 2:
+      //Blue
+      values[2] += 2;
+      if (values[2] > 255) {
+        values[2] = 255;
+        blinkUpperLimit();
+      }
+      break;
+  }
+
+  //Update the LED color
+  setLightColor(values[0], values[1], values[2]);
+  Serial.print("Updating RGB value to {");
+  Serial.print(values[0]);
+  Serial.print(", ");
+  Serial.print(values[1]);
+  Serial.print(", ");
+  Serial.print(values[2]);
+  Serial.println("}");
+}
+
+void handleRGBModeMinus() {
+  switch (adjustingCatergory) {
+    case 0:
+      //Red
+      values[0] -= 2;
+      if (values[0] <= 0) {
+        values[0] = 0;
+        blinkLowerLimit();
+      }
+      break;
+    case 1:
+      //Green
+      values[1] -= 2;
+      if (values[1] <= 0) {
+        values[1] = 0;
+        blinkLowerLimit();
+      }
+      break;
+    case 2:
+      //Blue
+      values[2] -= 2;
+      if (values[2] <= 0) {
+        values[2] = 0;
+        blinkLowerLimit();
+      }
+      break;
+  }
+
+  //Update the LED color
+  setLightColor(values[0], values[1], values[2]);
+  Serial.print("Updating RGB value to {");
+  Serial.print(values[0]);
+  Serial.print(", ");
+  Serial.print(values[1]);
+  Serial.print(", ");
+  Serial.print(values[2]);
+  Serial.println("}");
+}

firmware/rgbfill/mode_white.ino

@@ -1,6 +1,16 @@
+//Initialize the values of white mode to default runtime
+void loadWhiteModeDefault() {
+  values[0] = 5000; //5000K
+  values[1] = MAX_BRIGHTNESS / 2; //Half power
+  values[2] = 0;
+  adjustingCatergory = 0;
+  setColorTemperature(5000, MAX_BRIGHTNESS / 2);
+  //Set ctrl LED to low brightness white
+  setControlLEDColor(MAX_CTRLBRIGHTNESS, MAX_CTRLBRIGHTNESS, MAX_CTRLBRIGHTNESS);
+}
+
 //Set color temperature set the LED RGB Values based on given temperature K value and brigheness level (0 - 255)
 void setColorTemperature(int temperatureK, int brightnessLevel) {
-  
   // Check if brightness is within the valid range [0, 1]
   if (brightnessLevel > MAX_BRIGHTNESS) {
     brightnessLevel = MAX_BRIGHTNESS;
@@ -17,26 +27,29 @@ void setColorTemperature(int temperatureK, int brightnessLevel) {
   int blue = 0;
 
   normalizedTemperature = constrain(normalizedTemperature, -1.0, 1.0);
-  if (normalizedTemperature <= 0){
+  //Handle Red and Green channels
+  if (normalizedTemperature <= 0) {
     red = 255;
-    green = int(255 * (-0.402 * normalizedTemperature * normalizedTemperature * normalizedTemperature - 0.211 * normalizedTemperature * normalizedTemperature + 1.09* normalizedTemperature + 0.958));
-  }else{
+    green = int(255 * (-0.402 * normalizedTemperature * normalizedTemperature * normalizedTemperature - 0.211 * normalizedTemperature * normalizedTemperature + 1.09 * normalizedTemperature + 0.958));
+  } else {
     red = int(255 * (-0.990 * normalizedTemperature * normalizedTemperature * normalizedTemperature + 2.34 * normalizedTemperature * normalizedTemperature - 1.99 * normalizedTemperature + 0.970));
     green = int(255 * (-0.542 * normalizedTemperature * normalizedTemperature * normalizedTemperature + 1.37 * normalizedTemperature * normalizedTemperature - 1.28 * normalizedTemperature + 0.941));
   }
 
-  if (normalizedTemperature <= -0.7){
-     blue = int(0);
-  }else if (normalizedTemperature <= 0.0){
-     blue = int(255 * (0.0117*normalizedTemperature*normalizedTemperature*normalizedTemperature + 2.05*normalizedTemperature*normalizedTemperature + 2.85*normalizedTemperature + 1.00));
-  }else{
-     blue = int(255 * (1.0));
+  //Blue channel
+  if (normalizedTemperature <= -0.7) {
+    blue = int(0);
+  } else if (normalizedTemperature <= 0.0) {
+    blue = int(255 * (0.0117 * normalizedTemperature * normalizedTemperature * normalizedTemperature + 2.05 * normalizedTemperature * normalizedTemperature + 2.85 * normalizedTemperature + 1.00));
+  } else {
+    blue = int(255 * (1.0));
   }
 
+  //Scale it down to target brightness level
   red = red * brightness;
   green = green * brightness;
   blue = blue * brightness;
-  
+
   Serial.println(red);
   Serial.println(green);
   Serial.println(blue);

firmware/rgbfill/rgbfill.ino

@@ -12,7 +12,6 @@
 
 */
 #include <Adafruit_NeoPixel.h>
-#include "lib/tempcolor.h"
 
 // Hardware Configs
 #define PIN D4
@@ -31,7 +30,7 @@
    Current Mode
    0 = White Mode (+/- Change the K value of the light)
    1 = RGB Mode (+/C/- Change the RGB values of the light)
-   2 = Pure Color Mode (C Change the default color palletes)
+   2 = Pure Color Mode (C Change the default color palletes, +- change brightness offset)
    3 = Presets Mode (+/- Change the preset profile currently using)
 */
 int currentMode = 0;
@@ -43,6 +42,10 @@ int currentMode = 0;
    0 = Color Temperature (K)
    1 = Brightness
 
+   [RGB Mode]
+   0 = Red
+   1 = Green
+   2 = Blue
 
 */
 int adjustingCatergory = 0;
@@ -57,11 +60,15 @@ int adjustingCatergory = 0;
 
 */
 int values[] = {0, 0, 0};
+int currentCtrlLedRgb[] = {0,0,0};
 
 Adafruit_NeoPixel strip = Adafruit_NeoPixel(NUM_LEDS, PIN, NEO_GRB + NEO_KHZ800);
 
 //Set the current control LED color
 void setControlLEDColor(int r, int g, int b){
+  currentCtrlLedRgb[0] = r;
+  currentCtrlLedRgb[1] = g;
+  currentCtrlLedRgb[2] = b;
   strip.setPixelColor(0, strip.Color(r, g, b));
   strip.show();
 }
@@ -84,12 +91,7 @@ void setup() {
   strip.begin();
 
   // Initialize all pixels to natural warm white light
-  setColorTemperature(4000, MAX_BRIGHTNESS/2);
-  values[0] = 4000;
-  values[1] = MAX_BRIGHTNESS/2;
-
-  //Set ctrl LED to low brightness white
-  setControlLEDColor(MAX_CTRLBRIGHTNESS, MAX_CTRLBRIGHTNESS, MAX_CTRLBRIGHTNESS);
+  loadWhiteModeDefault();
 }
 
 void loop() {