Merge pull request #55 from andysheen/master

added catch to ensure led is fully off when at zero
interactionresearchstudio · Oct 12, 2020 · 37f4642 · 37f4642
2 parents aafdbef + 4da95d6
commit 37f4642
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/rgbled.ino b/rgbled.ino
@@ -26,14 +26,23 @@ void rgbLedHandler() {
     if (ledChanged[USERLED]) {
       ledChanged[USERLED] = false;
       saturation[USERLED] = 255;
-      leds[USERLED] = CHSV(hue[USERLED], saturation[USERLED], value[USERLED]);
+      if (value[USERLED] == 0) {
+        //Turn off
+        leds[USERLED] = CHSV(0, 0, 0);
+      } else {
+        leds[USERLED] = CHSV(hue[USERLED], saturation[USERLED], value[USERLED]);
+      }
       FastLED.show();
     }
     if (ledChanged[REMOTELED]) {
       ledChanged[REMOTELED] = false;
       saturation[REMOTELED] = 255;
-      //  value[REMOTELED] = 255;
-      leds[REMOTELED] = CHSV(hue[REMOTELED], saturation[REMOTELED], value[REMOTELED]);
+      if (value[REMOTELED] == 0) {
+        //turn off
+        leds[REMOTELED] = CHSV(0, 0, 0);
+      } else {
+        leds[REMOTELED] = CHSV(hue[REMOTELED], saturation[REMOTELED], value[REMOTELED]);
+      }
       FastLED.show();
     }
     //long fade

diff --git a/utility.ino b/utility.ino
@@ -125,6 +125,7 @@ void handleTouchEvent(AceButton* button, uint8_t eventType, uint8_t buttonState)
       } else {
         ledChanged[USERLED] = true;
         fadeRGB(USERLED);
+        isFadingRGB[USERLED] = false;
         startLongFade(USERLED);
         socketIO_sendColour();
       }