Added color, palette and speed fields.

Author: jasoncoon

README.md

@@ -14,12 +14,13 @@ Control addressable LEDs with an ESP32 via a web browser over Wi-Fi.
    * [x] pattern
    * [x] autoplay
    * [x] autoplay duration
+   * [x] speed
+   * [x] palette
 
 ### Currently Lacking:
 * [ ] Setting storage in EEPROM
 * [ ] More patterns
 * [ ] More parameters
-   * [ ] speed
    * [ ] solid color
    * [ ] fire cooling/sparking
    * [ ] twinkle speed/density

data/js/app.js

@@ -407,7 +407,7 @@ function postValue(name, value) {
 
   var body = { name: name, value: value };
 
-  $.post(urlBase + "fieldValue?" + name + "=" + value, body, function(data) {
+  $.post(urlBase + "fieldValue?name=" + name + "&value=" + value, body, function(data) {
     if (data.name != null) {
       $("#status").html("Set " + name + ": " + data.name);
     } else {
@@ -428,7 +428,7 @@ function postColor(name, value) {
 
   var body = { name: name, r: value.r, g: value.g, b: value.b };
 
-  $.post(urlBase + name + "?r=" + value.r + "&g=" + value.g + "&b=" + value.b, body, function(data) {
+  $.post(urlBase + "fieldValue?name=" + name + "&value=" + "&r=" + value.r + "&g=" + value.g + "&b=" + value.b, body, function(data) {
     $("#status").html("Set " + name + ": " + data);
   })
   .fail(function(textStatus, errorThrown) { $("#status").html("Fail: " + textStatus + " " + errorThrown); });

esp32-fastled-webserver.ino

@@ -49,6 +49,8 @@ uint8_t brightness = 64;
 
 uint8_t speed = 30;
 
+CRGB solidColor = CRGB::Blue;
+
 #define ARRAY_SIZE(A) (sizeof(A) / sizeof((A)[0]))
 
 #define DATA_PIN    12

fields.h

@@ -48,10 +48,23 @@ String getPattern() {
   return String(currentPatternIndex);
 }
 
+void setPattern(uint8_t value)
+{
+  if (value >= patternCount)
+    value = patternCount - 1;
+
+  currentPatternIndex = value;
+
+//  if (autoplay == 0) {
+//    EEPROM.write(1, currentPatternIndex);
+//    EEPROM.commit();
+//  }
+
+//  broadcastInt("pattern", currentPatternIndex);
+}
+
 String setPattern(String value) {
-  currentPatternIndex = value.toInt();
-  if (currentPatternIndex < 0) currentPatternIndex = 0;
-  else if (currentPatternIndex >= patternCount) currentPatternIndex = patternCount - 1;
+  setPattern(value.toInt());
   return String(currentPatternIndex);
 }
 
@@ -122,6 +135,37 @@ String setAutoplayDuration(String value) {
   return String(autoplayDuration);
 }
 
+String getSolidColor() {
+  return String(solidColor.r) + "," + String(solidColor.g) + "," + String(solidColor.b);
+}
+
+void setSolidColor(uint8_t r, uint8_t g, uint8_t b)
+{
+  solidColor = CRGB(r, g, b);
+
+  //  EEPROM.write(2, r);
+  //  EEPROM.write(3, g);
+  //  EEPROM.write(4, b);
+  //  EEPROM.commit();
+
+  setPattern(patternCount - 1);
+
+  //  broadcastString("color", String(solidColor.r) + "," + String(solidColor.g) + "," + String(solidColor.b));
+}
+
+void setSolidColor(CRGB color)
+{
+  setSolidColor(color.r, color.g, color.b);
+}
+
+String setSolidColor(String value) {
+  String r = webServer.arg("r");
+  String g = webServer.arg("g");
+  String b = webServer.arg("b");
+  setSolidColor(r.toInt(), g.toInt(), b.toInt());
+  return String(solidColor.r) + "," + String(solidColor.g) + "," + String(solidColor.b);
+}
+
 FieldList fields = {
   { "power", "Power", BooleanFieldType, 0, 1, getPower, NULL, setPower },
   { "brightness", "Brightness", NumberFieldType, 1, 255, getBrightness, NULL, setBrightness },
@@ -131,6 +175,8 @@ FieldList fields = {
   { "autoplaySection", "Autoplay", SectionFieldType },
   { "autoplay", "Autoplay", BooleanFieldType, 0, 1, getAutoplay, NULL, setAutoplay },
   { "autoplayDuration", "Autoplay Duration", NumberFieldType, 0, 255, getAutoplayDuration, NULL, setAutoplayDuration },
+  { "solidColorSection", "Solid Color", SectionFieldType },
+  { "solidColor", "Color", ColorFieldType, 0, 255, getSolidColor, NULL, setSolidColor },
 };
 
 uint8_t fieldCount = ARRAY_SIZE(fields);

patterns.h

@@ -0,0 +1,136 @@
+/*
+   ESP32 FastLED WebServer: https://github.com/jasoncoon/esp32-fastled-webserver
+   Copyright (C) 2017 Jason Coon
+
+   Built upon the amazing FastLED work of Daniel Garcia and Mark Kriegsman:
+   https://github.com/FastLED/FastLED
+
+   ESP32 support provided by the hard work of Sam Guyer:
+   https://github.com/samguyer/FastLED
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+const CRGBPalette16 palettes[] = {
+  RainbowColors_p,
+  RainbowStripeColors_p,
+  CloudColors_p,
+  LavaColors_p,
+  OceanColors_p,
+  ForestColors_p,
+  PartyColors_p,
+  HeatColors_p
+};
+
+const uint8_t paletteCount = ARRAY_SIZE(palettes);
+
+const String paletteNames[paletteCount] = {
+  "Rainbow",
+  "Rainbow Stripe",
+  "Cloud",
+  "Lava",
+  "Ocean",
+  "Forest",
+  "Party",
+  "Heat",
+};
+
+void rainbow()
+{
+  // FastLED's built-in rainbow generator
+  fill_rainbow( leds, NUM_LEDS, gHue, speed);
+}
+
+void addGlitter( fract8 chanceOfGlitter)
+{
+  if ( random8() < chanceOfGlitter) {
+    leds[ random16(NUM_LEDS) ] += CRGB::White;
+  }
+}
+
+void rainbowWithGlitter()
+{
+  // built-in FastLED rainbow, plus some random sparkly glitter
+  rainbow();
+  addGlitter(80);
+}
+
+void confetti()
+{
+  // random colored speckles that blink in and fade smoothly
+  fadeToBlackBy( leds, NUM_LEDS, 10);
+  int pos = random16(NUM_LEDS);
+  leds[pos] += CHSV( gHue + random8(64), 200, 255);
+}
+
+void sinelon()
+{
+  // a colored dot sweeping back and forth, with fading trails
+  fadeToBlackBy( leds, NUM_LEDS, 20);
+  int pos = beatsin16(speed, 0, NUM_LEDS - 1);
+  static int prevpos = 0;
+  CRGB color = ColorFromPalette(palettes[currentPaletteIndex], gHue, 255);
+  if ( pos < prevpos ) {
+    fill_solid( leds + pos, (prevpos - pos) + 1, color);
+  } else {
+    fill_solid( leds + prevpos, (pos - prevpos) + 1, color);
+  }
+  prevpos = pos;
+}
+
+void bpm()
+{
+  // colored stripes pulsing at a defined Beats-Per-Minute (BPM)
+  uint8_t beat = beatsin8( speed, 64, 255);
+  CRGBPalette16 palette = palettes[currentPaletteIndex];
+  for ( int i = 0; i < NUM_LEDS; i++) {
+    leds[i] = ColorFromPalette(palette, gHue + (i * 2), beat - gHue + (i * 10));
+  }
+}
+
+void juggle() {
+  // eight colored dots, weaving in and out of sync with each other
+  fadeToBlackBy( leds, NUM_LEDS, 20);
+  byte dothue = 0;
+  for ( int i = 0; i < 8; i++) {
+    leds[beatsin16( i + speed, 0, NUM_LEDS - 1 )] |= CHSV(dothue, 200, 255);
+    dothue += 32;
+  }
+}
+
+void showSolidColor()
+{
+  fill_solid(leds, NUM_LEDS, solidColor);
+}
+
+typedef void (*Pattern)();
+typedef Pattern PatternList[];
+typedef struct {
+  Pattern pattern;
+  String name;
+} PatternAndName;
+typedef PatternAndName PatternAndNameList[];
+
+PatternAndNameList patterns = {
+  { rainbow, "rainbow" },
+  { rainbowWithGlitter, "rainbowWithGlitter" },
+  { confetti, "confetti" },
+  { sinelon, "sinelon" },
+  { juggle, "juggle" },
+  { bpm, "bpm" },
+
+  { showSolidColor,         "Solid Color" },
+};
+
+const uint8_t patternCount = ARRAY_SIZE(patterns);
+