Merge branch 'main' into fibonacci512mini

Author: jasoncoon

.gitignore

@@ -4,3 +4,4 @@ build/
 buildcache/
 arduino.json
 c_cpp_properties.json
+.vscode

Fields.h

@@ -133,6 +133,10 @@ String getTwinkleDensity() {
   return String(twinkleDensity);
 }
 
+String getCoolLikeIncandescent() {
+  return String(coolLikeIncandescent);
+}
+
 String getName() {
   return nameString;
 }
@@ -286,6 +290,15 @@ FieldList fields = {
     {"solidColorSection", "Solid Color", SectionFieldType},
     {"solidColor", "Color", ColorFieldType, 0, 255, getSolidColor},
 
+    {"fireSection", "Fire & Water", SectionFieldType},
+    {"cooling", "Cooling", NumberFieldType, 0, 255, getCooling},
+    {"sparking", "Sparking", NumberFieldType, 0, 255, getSparking},
+
+    {"twinklesSection", "Twinkles", SectionFieldType},
+    {"twinkleSpeed", "Twinkle Speed", NumberFieldType, 0, 8, getTwinkleSpeed},
+    {"twinkleDensity", "Twinkle Density", NumberFieldType, 0, 8, getTwinkleDensity},
+    {"coolLikeIncandescent", "Incandescent Cool", BooleanFieldType, 0, 1, getCoolLikeIncandescent},
+
     {"prideSection", "Pride & ColorWaves", SectionFieldType},
 
     {"saturationBpm", "Saturation BPM", NumberFieldType, 0, 255, getSaturationBpm, NULL, setSaturationBpm},
@@ -311,15 +324,6 @@ FieldList fields = {
     {"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},
-
-
-    {"fireSection", "Fire & Water", SectionFieldType},
-    {"cooling", "Cooling", NumberFieldType, 0, 255, getCooling},
-    {"sparking", "Sparking", NumberFieldType, 0, 255, getSparking},
-
-    {"twinklesSection", "Twinkles", SectionFieldType},
-    {"twinkleSpeed", "Twinkle Speed", NumberFieldType, 0, 8, getTwinkleSpeed},
-    {"twinkleDensity", "Twinkle Density", NumberFieldType, 0, 8, getTwinkleDensity}
 };
 
 uint8_t fieldCount = ARRAY_SIZE(fields);

README.md

@@ -74,8 +74,6 @@ The web app needs to be uploaded to the ESP8266's SPIFFS.  You can do this withi
 
 With ESP8266FS installed upload the web app using `ESP8266 Sketch Data Upload` command in the Arduino Tools menu.
 
-Then enter your wi-fi network SSID and password in the WiFi.h file, and upload the sketch using the Upload button.
-
 Compression
 -----------
 

TwinkleFOX.h

@@ -85,7 +85,7 @@ CRGB gBackgroundColor = CRGB::Black;
 // If COOL_LIKE_INCANDESCENT is set to 1, colors will
 // fade out slighted 'reddened', similar to how
 // incandescent bulbs change color as they get dim down.
-#define COOL_LIKE_INCANDESCENT 1
+uint8_t coolLikeIncandescent = 1;
 
 CRGBPalette16 twinkleFoxPalette;
 
@@ -112,7 +112,7 @@ uint8_t attackDecayWave8( uint8_t i)
 // This function takes a pixel, and if its in the 'fading down'
 // part of the cycle, it adjusts the color a little bit like the
 // way that incandescent bulbs fade toward 'red' as they dim.
-void coolLikeIncandescent( CRGB& c, uint8_t phase)
+void doCoolLikeIncandescent( CRGB& c, uint8_t phase)
 {
   if( phase < 128) return;
 
@@ -148,8 +148,8 @@ CRGB computeOneTwinkle( uint32_t ms, uint8_t salt)
   CRGB c;
   if( bright > 0) {
     c = ColorFromPalette( twinkleFoxPalette, hue, bright, NOBLEND);
-    if( COOL_LIKE_INCANDESCENT == 1 ) {
-      coolLikeIncandescent( c, fastcycle8);
+    if( coolLikeIncandescent == 1 ) {
+      doCoolLikeIncandescent( c, fastcycle8);
     }
   } else {
     c = CRGB::Black;

deployfirmware.sh

@@ -0,0 +1,6 @@
+outputDir=build
+binFilename=tree-v2.ino.bin
+ip=${1:-"192.168.86.36"}
+url="http://$ip/update"
+
+curl -v --form "file=@$outputDir/$binFilename;filename=$binFilename" $url

esp8266-fastled-webserver.ino

@@ -79,7 +79,7 @@ CRGB leds[NUM_LEDS];
 
 const uint8_t brightnessCount = 5;
 uint8_t brightnessMap[brightnessCount] = { 16, 32, 64, 128, 255 };
-uint8_t brightnessIndex = 0;
+uint8_t brightnessIndex = 3;
 
 // ten seconds per color palette makes a good demo
 // 20-120 is better for deployment
@@ -300,7 +300,7 @@ void setup() {
   FastLED.show();
 
   EEPROM.begin(512);
-  loadSettings();
+  readSettings();
 
   FastLED.setBrightness(brightness);
 
@@ -315,6 +315,7 @@ void setup() {
   Serial.print( F("Flash ID: ") ); Serial.println(spi_flash_get_id());
   Serial.print( F("Flash Size: ") ); Serial.println(ESP.getFlashChipRealSize());
   Serial.print( F("Vcc: ") ); Serial.println(ESP.getVcc());
+  Serial.print( F("MAC Address: ") ); Serial.println(WiFi.macAddress());
   Serial.println();
 
   SPIFFS.begin();
@@ -332,13 +333,20 @@ void setup() {
 
   // Do a little work to get a unique-ish name. Get the
   // last two bytes of the MAC (HEX'd)":
+
+  // copy the mac address to a byte array
   uint8_t mac[WL_MAC_ADDR_LENGTH];
   WiFi.softAPmacAddress(mac);
-  String macID = String(mac[WL_MAC_ADDR_LENGTH - 2], HEX) +
-                 String(mac[WL_MAC_ADDR_LENGTH - 1], HEX);
-  macID.toUpperCase();
 
-  nameString = "Fibonacci512-" + macID;
+  // format the last two digits to hex character array, like 0A0B
+  char macID[5];
+  sprintf(macID, "%02X%02X", mac[WL_MAC_ADDR_LENGTH - 2], mac[WL_MAC_ADDR_LENGTH - 1]);
+
+  // convert the character array to a string
+  String macIdString = macID;
+  macIdString.toUpperCase();
+
+  nameString = "Fibonacci512-" + macIdString;
 
   char nameChar[nameString.length() + 1];
   memset(nameChar, 0, nameString.length() + 1);
@@ -395,6 +403,7 @@ void setup() {
   webServer.on("/cooling", HTTP_POST, []() {
     String value = webServer.arg("value");
     cooling = value.toInt();
+    writeAndCommitSettings();
     broadcastInt("cooling", cooling);
     webServer.sendHeader("Access-Control-Allow-Origin", "*");
     sendInt(cooling);
@@ -403,6 +412,7 @@ void setup() {
   webServer.on("/sparking", HTTP_POST, []() {
     String value = webServer.arg("value");
     sparking = value.toInt();
+    writeAndCommitSettings();
     broadcastInt("sparking", sparking);
     webServer.sendHeader("Access-Control-Allow-Origin", "*");
     sendInt(sparking);
@@ -421,6 +431,7 @@ void setup() {
     twinkleSpeed = value.toInt();
     if (twinkleSpeed < 0) twinkleSpeed = 0;
     else if (twinkleSpeed > 8) twinkleSpeed = 8;
+    writeAndCommitSettings();
     broadcastInt("twinkleSpeed", twinkleSpeed);
     webServer.sendHeader("Access-Control-Allow-Origin", "*");
     sendInt(twinkleSpeed);
@@ -431,11 +442,22 @@ void setup() {
     twinkleDensity = value.toInt();
     if (twinkleDensity < 0) twinkleDensity = 0;
     else if (twinkleDensity > 8) twinkleDensity = 8;
+    writeAndCommitSettings();
     broadcastInt("twinkleDensity", twinkleDensity);
     webServer.sendHeader("Access-Control-Allow-Origin", "*");
     sendInt(twinkleDensity);
   });
 
+  webServer.on("/coolLikeIncandescent", HTTP_POST, []() {
+    String value = webServer.arg("value");
+    coolLikeIncandescent = value.toInt();
+    if (coolLikeIncandescent < 0) coolLikeIncandescent = 0;
+    else if (coolLikeIncandescent > 1) coolLikeIncandescent = 1;
+    writeAndCommitSettings();
+    broadcastInt("coolLikeIncandescent", coolLikeIncandescent);
+    sendInt(coolLikeIncandescent);
+  });
+
   webServer.on("/solidColor", HTTP_POST, []() {
     String r = webServer.arg("r");
     String g = webServer.arg("g");
@@ -881,8 +903,15 @@ void loop() {
 //  }
 //}
 
-void loadSettings()
+void readSettings()
 {
+  // check for "magic number" so we know settings have been written to EEPROM
+  // and it's not just full of random bytes
+
+  if (EEPROM.read(511) != 55) {
+    return;
+  }
+
   brightness = EEPROM.read(0);
 
   currentPatternIndex = EEPROM.read(1);
@@ -914,37 +943,56 @@ void loadSettings()
   else if (currentPaletteIndex >= paletteCount)
     currentPaletteIndex = paletteCount - 1;
 
-  showClock = EEPROM.read(9);
-  clockBackgroundFade = EEPROM.read(10);
+  twinkleSpeed = EEPROM.read(9);
+  twinkleDensity = EEPROM.read(10);
+
+  cooling = EEPROM.read(11);
+  sparking = EEPROM.read(12);
+
+  coolLikeIncandescent = EEPROM.read(13);
+
+  showClock = EEPROM.read(14);
+  clockBackgroundFade = EEPROM.read(15);
 }
 
-void setPower(uint8_t value)
+void writeAndCommitSettings()
 {
-  power = value == 0 ? 0 : 1;
-
+  EEPROM.write(0, brightness);
+  EEPROM.write(1, currentPatternIndex);
+  EEPROM.write(2, solidColor.r);
+  EEPROM.write(3, solidColor.g);
+  EEPROM.write(4, solidColor.b);
   EEPROM.write(5, power);
+  EEPROM.write(6, autoplay);
+  EEPROM.write(7, autoplayDuration);
+  EEPROM.write(8, currentPaletteIndex);
+  EEPROM.write(9, twinkleSpeed);
+  EEPROM.write(10, twinkleDensity);
+  EEPROM.write(11, cooling);
+  EEPROM.write(12, sparking);
+
+  EEPROM.write(511, 55);
   EEPROM.commit();
+}
 
+void setPower(uint8_t value)
+{
+  power = value == 0 ? 0 : 1;
+  writeAndCommitSettings();
   broadcastInt("power", power);
 }
 
 void setAutoplay(uint8_t value)
 {
   autoplay = value == 0 ? 0 : 1;
-
-  EEPROM.write(6, autoplay);
-  EEPROM.commit();
-
+  writeAndCommitSettings();
   broadcastInt("autoplay", autoplay);
 }
 
 void setAutoplayDuration(uint8_t value)
 {
   autoplayDuration = value;
-
-  EEPROM.write(7, autoplayDuration);
-  EEPROM.commit();
-
+  writeAndCommitSettings();
   autoPlayTimeout = millis() + (autoplayDuration * 1000);
 
   broadcastInt("autoplayDuration", autoplayDuration);
@@ -958,12 +1006,7 @@ void setSolidColor(CRGB color)
 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();
-
+  writeAndCommitSettings();
   setPattern(patternCount - 1);
 
   broadcastString("color", String(solidColor.r) + "," + String(solidColor.g) + "," + String(solidColor.b));
@@ -984,8 +1027,7 @@ void adjustPattern(bool up)
     currentPatternIndex = 0;
 
   if (autoplay == 0) {
-    EEPROM.write(1, currentPatternIndex);
-    EEPROM.commit();
+    writeAndCommitSettings();
   }
 
   broadcastInt("pattern", currentPatternIndex);
@@ -999,8 +1041,7 @@ void setPattern(uint8_t value)
   currentPatternIndex = value;
 
   if (autoplay == 0) {
-    EEPROM.write(1, currentPatternIndex);
-    EEPROM.commit();
+    writeAndCommitSettings();
   }
 
   broadcastInt("pattern", currentPatternIndex);
@@ -1022,10 +1063,7 @@ void setPalette(uint8_t value)
     value = paletteCount - 1;
 
   currentPaletteIndex = value;
-
-  EEPROM.write(8, currentPaletteIndex);
-  EEPROM.commit();
-
+  writeAndCommitSettings();
   broadcastInt("palette", currentPaletteIndex);
 }
 
@@ -1049,10 +1087,7 @@ void adjustBrightness(bool up)
   brightness = brightnessMap[brightnessIndex];
 
   FastLED.setBrightness(brightness);
-
-  EEPROM.write(0, brightness);
-  EEPROM.commit();
-
+  writeAndCommitSettings();
   broadcastInt("brightness", brightness);
 }
 
@@ -1065,10 +1100,7 @@ void setBrightness(uint8_t value)
   brightness = value;
 
   FastLED.setBrightness(brightness);
-
-  EEPROM.write(0, brightness);
-  EEPROM.commit();
-
+  writeAndCommitSettings();
   broadcastInt("brightness", brightness);
 }