Merge pull request #208 from henrygab/bugfixes

Move to subdirectory, fix various compiler warnings

Author: jasoncoon

ColorWavesPlayground.h renamed to esp8266-fastled-webserver/ColorWavesPlayground.h

@@ -40,8 +40,9 @@ bool handleFileRead(String path){
     if(SPIFFS.exists(pathWithGz))
       path += ".gz";
     File file = SPIFFS.open(path, "r");
-    size_t sent = webServer.streamFile(file, contentType);
+    (void)webServer.streamFile(file, contentType);
     file.close();
+    
     return true;
   }
   return false;

Commands.h renamed to esp8266-fastled-webserver/Commands.h

@@ -242,57 +242,63 @@ String setSHueMax(String value) {
   sHueMax = value.toInt(); return value;
 }
 
+// name, label, type, min, max, getValue, getOptions, setValue
 FieldList fields = {
-    {"name", "Name", LabelFieldType, 0, 0, getName},
+    {"name",       "Name",       LabelFieldType,   0,            0, getName,       nullptr,     nullptr},
 
-    {"power", "Power", BooleanFieldType, 0, 1, getPower},
-    {"brightness", "Brightness", NumberFieldType, 1, 255, getBrightness},
-    {"pattern", "Pattern", SelectFieldType, 0, patternCount, getPattern, getPatterns},
-    {"palette", "Palette", SelectFieldType, 0, paletteCount, getPalette, getPalettes},
-    {"speed", "Speed", NumberFieldType, 1, 255, getSpeed},
+    {"power",      "Power",      BooleanFieldType, 0,            1, getPower,      nullptr,     nullptr},
+    {"brightness", "Brightness", NumberFieldType,  1,          255, getBrightness, nullptr,     nullptr},
+    {"pattern",    "Pattern",    SelectFieldType,  0, patternCount, getPattern,    getPatterns, nullptr},
+    {"palette",    "Palette",    SelectFieldType,  0, paletteCount, getPalette,    getPalettes, nullptr},
+    {"speed",      "Speed",      NumberFieldType,  1,          255, getSpeed,      nullptr,     nullptr},
 
-    {"autoplaySection", "Autoplay", SectionFieldType},
-    {"autoplay", "Autoplay", BooleanFieldType, 0, 1, getAutoplay},
-    {"autoplayDuration", "Autoplay Duration", NumberFieldType, 0, 255, getAutoplayDuration},
+    //--------------------------------------------------------------------------------------------------------
+    {"autoplaySection",  "Autoplay",          SectionFieldType, 0,   0, nullptr,             nullptr, nullptr},
+    {"autoplay",         "Autoplay",          BooleanFieldType, 0,   1, getAutoplay,         nullptr, nullptr},
+    {"autoplayDuration", "Autoplay Duration", NumberFieldType,  0, 255, getAutoplayDuration, nullptr, nullptr},
 
-    {"solidColorSection", "Solid Color", SectionFieldType},
-    {"solidColor", "Color", ColorFieldType, 0, 255, getSolidColor},
+    //--------------------------------------------------------------------------------------------------------
+    {"solidColorSection", "Solid Color", SectionFieldType, 0,   0, nullptr,       nullptr, nullptr},
+    {"solidColor",        "Color",       ColorFieldType,   0, 255, getSolidColor, nullptr, nullptr},
 
-    {"fireSection", "Fire & Water", SectionFieldType},
-    {"cooling", "Cooling", NumberFieldType, 0, 255, getCooling},
-    {"sparking", "Sparking", NumberFieldType, 0, 255, getSparking},
+    //--------------------------------------------------------------------------------------------------------
+    {"fireSection", "Fire & Water", SectionFieldType, 0,   0, nullptr,     nullptr, nullptr},
+    {"cooling",     "Cooling",      NumberFieldType,  0, 255, getCooling,  nullptr, nullptr},
+    {"sparking",    "Sparking",     NumberFieldType,  0, 255, getSparking, nullptr, nullptr},
 
-    {"twinklesSection", "Twinkles", SectionFieldType},
-    {"twinkleSpeed", "Twinkle Speed", NumberFieldType, 0, 8, getTwinkleSpeed},
-    {"twinkleDensity", "Twinkle Density", NumberFieldType, 0, 8, getTwinkleDensity},
-    {"coolLikeIncandescent", "Incandescent Cool", BooleanFieldType, 0, 1, getCoolLikeIncandescent},
+    //--------------------------------------------------------------------------------------------------------
+    {"twinklesSection",      "Twinkles",          SectionFieldType, 0, 0, nullptr,                 nullptr, nullptr},
+    {"twinkleSpeed",         "Twinkle Speed",     NumberFieldType,  0, 8, getTwinkleSpeed,         nullptr, nullptr},
+    {"twinkleDensity",       "Twinkle Density",   NumberFieldType,  0, 8, getTwinkleDensity,       nullptr, nullptr},
+    {"coolLikeIncandescent", "Incandescent Cool", BooleanFieldType, 0, 1, getCoolLikeIncandescent, nullptr, nullptr},
 
 
-    {"prideSection", "Pride", SectionFieldType},
+    //--------------------------------------------------------------------------------------------------------
+    {"prideSection",  "Pride",          SectionFieldType, 0,   0, nullptr, nullptr, nullptr},
 
-    {"saturationBpm", "Saturation BPM", NumberFieldType, 0, 255, getSaturationBpm, NULL, setSaturationBpm},
-    {"saturationMin", "Saturation Min", NumberFieldType, 0, 255, getSaturationMin, NULL, setSaturationMin},
-    {"saturationMax", "Saturation Max", NumberFieldType, 0, 255, getSaturationMax, NULL, setSaturationMax},
+    {"saturationBpm", "Saturation BPM", NumberFieldType,  0, 255, getSaturationBpm, nullptr, setSaturationBpm},
+    {"saturationMin", "Saturation Min", NumberFieldType,  0, 255, getSaturationMin, nullptr, setSaturationMin},
+    {"saturationMax", "Saturation Max", NumberFieldType,  0, 255, getSaturationMax, nullptr, setSaturationMax},
 
-    {"brightDepthBpm", "Brightness Depth BPM", NumberFieldType, 0, 255, getBrightDepthBpm, NULL, setBrightDepthBpm},
-    {"brightDepthMin", "Brightness Depth Min", NumberFieldType, 0, 255, getBrightDepthMin, NULL, setBrightDepthMin},
-    {"brightDepthMax", "Brightness Depth Max", NumberFieldType, 0, 255, getBrightDepthMax, NULL, setBrightDepthMax},
+    {"brightDepthBpm", "Brightness Depth BPM", NumberFieldType, 0, 255, getBrightDepthBpm, nullptr, setBrightDepthBpm},
+    {"brightDepthMin", "Brightness Depth Min", NumberFieldType, 0, 255, getBrightDepthMin, nullptr, setBrightDepthMin},
+    {"brightDepthMax", "Brightness Depth Max", NumberFieldType, 0, 255, getBrightDepthMax, nullptr, setBrightDepthMax},
 
-    {"brightThetaIncBpm", "Bright Theta Inc BPM", NumberFieldType, 0, 255, getBrightThetaIncBpm, NULL, setBrightThetaIncBpm},
-    {"brightThetaIncMin", "Bright Theta Inc Min", NumberFieldType, 0, 255, getBrightThetaIncMin, NULL, setBrightThetaIncMin},
-    {"brightThetaIncMax", "Bright Theta Inc Max", NumberFieldType, 0, 255, getBrightThetaIncMax, NULL, setBrightThetaIncMax},
+    {"brightThetaIncBpm", "Bright Theta Inc BPM", NumberFieldType, 0, 255, getBrightThetaIncBpm, nullptr, setBrightThetaIncBpm},
+    {"brightThetaIncMin", "Bright Theta Inc Min", NumberFieldType, 0, 255, getBrightThetaIncMin, nullptr, setBrightThetaIncMin},
+    {"brightThetaIncMax", "Bright Theta Inc Max", NumberFieldType, 0, 255, getBrightThetaIncMax, nullptr, setBrightThetaIncMax},
 
-    {"msMultiplierBpm", "Time Multiplier BPM", NumberFieldType, 0, 255, getMsMultiplierBpm, NULL, setMsMultiplierBpm},
-    {"msMultiplierMin", "Time Multiplier Min", NumberFieldType, 0, 255, getMsMultiplierMin, NULL, setMsMultiplierMin},
-    {"msMultiplierMax", "Time Multiplier Max", NumberFieldType, 0, 255, getMsMultiplierMax, NULL, setMsMultiplierMax},
+    {"msMultiplierBpm", "Time Multiplier BPM", NumberFieldType, 0, 255, getMsMultiplierBpm, nullptr, setMsMultiplierBpm},
+    {"msMultiplierMin", "Time Multiplier Min", NumberFieldType, 0, 255, getMsMultiplierMin, nullptr, setMsMultiplierMin},
+    {"msMultiplierMax", "Time Multiplier Max", NumberFieldType, 0, 255, getMsMultiplierMax, nullptr, setMsMultiplierMax},
 
-    {"hueIncBpm", "Hue Inc BPM", NumberFieldType, 0, 255, getHueIncBpm, NULL, setHueIncBpm},
-    {"hueIncMin", "Hue Inc Min", NumberFieldType, 0, 255, getHueIncMin, NULL, setHueIncMin},
-    {"hueIncMax", "Hue Inc Max", NumberFieldType, 0, 255, getHueIncMax, NULL, setHueIncMax},
+    {"hueIncBpm", "Hue Inc BPM", NumberFieldType, 0, 255, getHueIncBpm, nullptr, setHueIncBpm},
+    {"hueIncMin", "Hue Inc Min", NumberFieldType, 0, 255, getHueIncMin, nullptr, setHueIncMin},
+    {"hueIncMax", "Hue Inc Max", NumberFieldType, 0, 255, getHueIncMax, nullptr, setHueIncMax},
 
-    {"sHueBpm", "S Hue BPM", NumberFieldType, 0, 255, getSHueBpm, NULL, setSHueBpm},
-    {"sHueMin", "S Hue Min", NumberFieldType, 0, 255, getSHueMin, NULL, setSHueMin},
-    {"sHueMax", "S Hue Max", NumberFieldType, 0, 255, getSHueMax, NULL, setSHueMax},
+    {"sHueBpm", "S Hue BPM", NumberFieldType, 0, 255, getSHueBpm, nullptr, setSHueBpm},
+    {"sHueMin", "S Hue Min", NumberFieldType, 0, 255, getSHueMin, nullptr, setSHueMin},
+    {"sHueMax", "S Hue Max", NumberFieldType, 0, 255, getSHueMax, nullptr, setSHueMax},
 };
 
 uint8_t fieldCount = ARRAY_SIZE(fields);

FSBrowser.h renamed to esp8266-fastled-webserver/FSBrowser.h

@@ -34,10 +34,10 @@
 
 const bool discovery = false;
 const String serverName = "https://ping.evilgeniuslabs.org"; // address of server to ping
+// const uint8_t fingerprint[20] { 0xAD, 0x1F, 0xCB, 0xD9, 0xA0, 0xBC, 0x17, 0xD5, 0x5B, 0xF2, 0xE1, 0xBF, 0x98, 0xD1, 0x06, 0xCD, 0xAC, 0x3F, 0xB8, 0x33 }; // server SSL cert fingerprint
 
 void checkPingTimer() {
-  if (!discovery) 
-    return;
+  if (!discovery) return;
 
   const unsigned long pingDelay = 600000; /// 60 * 10 * 1000; // 10 minutes
   static unsigned long lastPingTime = pingDelay;
@@ -48,10 +48,13 @@ void checkPingTimer() {
     // Check WiFi connection status
     if (WiFi.status() == WL_CONNECTED) {
       Serial.println("Connected, ready to ping");
-      HTTPClient http;      
-      BearSSL::WiFiClientSecure newSecure;
-      newSecure.setInsecure();
-      http.begin(newSecure, serverName);
+
+      HTTPClient http;
+      BearSSL::WiFiClientSecure client;
+
+      //client.setFingerprint(fingerprint);
+      client.setInsecure();
+      http.begin(client, serverName);
       http.addHeader("Content-Type", "application/json");
       String deviceName = "\"deviceName\":\"" + nameString;
       String localIp = WiFi.localIP().toString();

Field.h renamed to esp8266-fastled-webserver/Field.h

@@ -93,10 +93,10 @@ CRGBPalette16 twinkleFoxPalette;
 // symmetrical up-and-down triangle sawtooth waveform, except that this
 // function produces a triangle wave with a faster attack and a slower decay:
 //
-//     / \
-//    /     \
-//   /         \
-//  /             \
+//     / \            / \            /
+//    /     \        /     \        /
+//   /         \    /         \    /
+//  /             \/             \/
 //
 
 uint8_t attackDecayWave8( uint8_t i)

Fields.h renamed to esp8266-fastled-webserver/Fields.h

@@ -282,8 +282,9 @@ void setup() {
   char nameChar[nameString.length() + 1];
   memset(nameChar, 0, nameString.length() + 1);
 
-  for (int i = 0; i < nameString.length(); i++)
+  for (unsigned int i = 0; i < nameString.length(); i++) {
     nameChar[i] = nameString.charAt(i);
+  }
 
   Serial.printf("Name: %s\n", nameChar );
 
@@ -359,9 +360,13 @@ void setup() {
 
   webServer.on("/twinkleSpeed", HTTP_POST, []() {
     String value = webServer.arg("value");
-    twinkleSpeed = value.toInt();
-    if (twinkleSpeed < 0) twinkleSpeed = 0;
-    else if (twinkleSpeed > 8) twinkleSpeed = 8;
+    long tmp = value.toInt();
+    if (tmp < 0) {
+      tmp = 0;
+    } else if (tmp > 8) {
+      tmp = 8;
+    }
+    twinkleSpeed = (uint8_t)tmp;
     writeAndCommitSettings();
     broadcastInt("twinkleSpeed", twinkleSpeed);
     webServer.sendHeader("Access-Control-Allow-Origin", "*");
@@ -370,9 +375,13 @@ void setup() {
 
   webServer.on("/twinkleDensity", HTTP_POST, []() {
     String value = webServer.arg("value");
-    twinkleDensity = value.toInt();
-    if (twinkleDensity < 0) twinkleDensity = 0;
-    else if (twinkleDensity > 8) twinkleDensity = 8;
+    long tmp = value.toInt();
+    if (tmp < 0) {
+      tmp = 0;
+    } else if (tmp > 8) {
+      tmp = 8;
+    }
+    twinkleDensity = tmp;
     writeAndCommitSettings();
     broadcastInt("twinkleDensity", twinkleDensity);
     webServer.sendHeader("Access-Control-Allow-Origin", "*");
@@ -381,9 +390,13 @@ void setup() {
 
   webServer.on("/coolLikeIncandescent", HTTP_POST, []() {
     String value = webServer.arg("value");
-    coolLikeIncandescent = value.toInt();
-    if (coolLikeIncandescent < 0) coolLikeIncandescent = 0;
-    else if (coolLikeIncandescent > 1) coolLikeIncandescent = 1;
+    long tmp = value.toInt();
+    if (tmp < 0) {
+      tmp = 0;
+    } else if (tmp > 1) {
+      tmp = 1;
+    }
+    coolLikeIncandescent = tmp;
     writeAndCommitSettings();
     broadcastInt("coolLikeIncandescent", coolLikeIncandescent);
     sendInt(coolLikeIncandescent);
@@ -830,10 +843,9 @@ void readSettings()
   brightness = EEPROM.read(0);
 
   currentPatternIndex = EEPROM.read(1);
-  if (currentPatternIndex < 0)
-    currentPatternIndex = 0;
-  else if (currentPatternIndex >= patternCount)
+  if (currentPatternIndex >= patternCount) {
     currentPatternIndex = patternCount - 1;
+  }
 
   byte r = EEPROM.read(2);
   byte g = EEPROM.read(3);
@@ -853,10 +865,9 @@ void readSettings()
   autoplayDuration = EEPROM.read(7);
 
   currentPaletteIndex = EEPROM.read(8);
-  if (currentPaletteIndex < 0)
-    currentPaletteIndex = 0;
-  else if (currentPaletteIndex >= paletteCount)
+  if (currentPaletteIndex >= paletteCount) {
     currentPaletteIndex = paletteCount - 1;
+  }
 
   twinkleSpeed = EEPROM.read(9);
   twinkleDensity = EEPROM.read(10);
@@ -932,11 +943,10 @@ void adjustPattern(bool up)
   else
     currentPatternIndex--;
 
-  // wrap around at the ends
-  if (currentPatternIndex < 0)
-    currentPatternIndex = patternCount - 1;
-  if (currentPatternIndex >= patternCount)
+  // wrap around at the end
+  if (currentPatternIndex >= patternCount) {
     currentPatternIndex = 0;
+  }
 
   if (autoplay == 0) {
     writeAndCommitSettings();
@@ -1005,10 +1015,6 @@ void adjustBrightness(bool up)
 
 void setBrightness(uint8_t value)
 {
-  if (value > 255)
-    value = 255;
-  else if (value < 0) value = 0;
-
   brightness = value;
 
   FastLED.setBrightness(brightness);