From 5c1f793887739ac1a73306d1f979022f4b1fbcc0 Mon Sep 17 00:00:00 2001
From: Caleb Mah <calebmah@gmail.com>
Date: Thu, 16 Jul 2020 23:29:06 +0800
Subject: [PATCH 01/19] photoresister sensor usermod

---
 .../photoresistor_sensor_mqtt_v1/README.md    | 11 +++
 .../photoresistor_sensor_mqtt_v1/usermod.cpp  | 70 +++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 usermods/photoresistor_sensor_mqtt_v1/README.md
 create mode 100644 usermods/photoresistor_sensor_mqtt_v1/usermod.cpp

diff --git a/usermods/photoresistor_sensor_mqtt_v1/README.md b/usermods/photoresistor_sensor_mqtt_v1/README.md
new file mode 100644
index 0000000000..33d96bc743
--- /dev/null
+++ b/usermods/photoresistor_sensor_mqtt_v1/README.md
@@ -0,0 +1,11 @@
+# Photoresister sensor with MQTT
+
+This simple usermod allows attaching a photoresistor sensor like the KY-018 and publish the readings in percentage over MQTT. The frequency of MQTT messages can be modified, and there is a threshold value that can be set so that significant changes in the readings can be published immediately instead of waiting for the next update. This was found to be a good compromise between spamming MQTT messages and delayed updates.
+
+I also found it useful to limit the frequency of analog pin reads because otherwise the board hangs.
+
+This usermod has only been tested with the KY-018 sensor though should work for any other analog pin sensor. Note that this does not control the LED strip directly, it only publishes MQTT readings for use with other integrations like Home Assistant.
+
+## Installation
+
+Copy and replace the file `usermod.cpp` in wled00 directory.
diff --git a/usermods/photoresistor_sensor_mqtt_v1/usermod.cpp b/usermods/photoresistor_sensor_mqtt_v1/usermod.cpp
new file mode 100644
index 0000000000..fff7118f3d
--- /dev/null
+++ b/usermods/photoresistor_sensor_mqtt_v1/usermod.cpp
@@ -0,0 +1,70 @@
+#include "wled.h"
+/*
+ * This v1 usermod file allows you to add own functionality to WLED more easily
+ * See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
+ * EEPROM bytes 2750+ are reserved for your custom use case. (if you extend #define EEPSIZE in const.h)
+ * If you just need 8 bytes, use 2551-2559 (you do not need to increase EEPSIZE)
+ * 
+ * Consider the v2 usermod API if you need a more advanced feature set!
+ */
+
+//Use userVar0 and userVar1 (API calls &U0=,&U1=, uint16_t)
+
+const int LIGHT_PIN = A0; // define analog pin
+const long UPDATE_MS = 30000; // Upper threshold between mqtt messages
+const char MQTT_TOPIC[] = "/light"; // MQTT topic for sensor values
+const int CHANGE_THRESHOLD = 5; // Change threshold in percentage to send before UPDATE_MS
+
+// variables
+long lastTime = 0;
+long timeDiff = 0;
+long readTime = 0;
+int lightValue = 0; 
+float lightPercentage = 0;
+float lastPercentage = 0;
+
+//gets called once at boot. Do all initialization that doesn't depend on network here
+void userSetup()
+{
+  pinMode(LIGHT_PIN, INPUT);
+}
+
+//gets called every time WiFi is (re-)connected. Initialize own network interfaces here
+void userConnected()
+{
+
+}
+
+void publishMqtt(float state)
+{
+  //Check if MQTT Connected, otherwise it will crash the 8266
+  if (mqtt != nullptr){
+    char subuf[38];
+    strcpy(subuf, mqttDeviceTopic);
+    strcat(subuf, MQTT_TOPIC);
+    mqtt->publish(subuf, 0, true, String(state).c_str());
+  }
+}
+
+//loop. You can use "if (WLED_CONNECTED)" to check for successful connection
+void userLoop()
+{
+   // Read only every 500ms, otherwise it causes the board to hang
+  if (millis() - readTime > 500)
+  {
+    readTime = millis();
+    timeDiff = millis() - lastTime;
+    
+    // Convert value to percentage
+    lightValue = analogRead(LIGHT_PIN);
+    lightPercentage = ((float)lightValue * -1 + 1024)/(float)1024 *100;
+    
+    // Send MQTT message on significant change or after UPDATE_MS
+    if (abs(lightPercentage - lastPercentage) > CHANGE_THRESHOLD || timeDiff > UPDATE_MS) 
+    {
+      publishMqtt(lightPercentage);
+      lastTime = millis();
+      lastPercentage = lightPercentage;
+    }
+  }
+}

From 51a7c2adc53cbb88022b974eebfa3e479c810bd1 Mon Sep 17 00:00:00 2001
From: Caleb Mah <calebmah@gmail.com>
Date: Thu, 16 Jul 2020 23:32:23 +0800
Subject: [PATCH 02/19] PIR sensor usermod

---
 usermods/PIR_sensor_mqtt_v1/README.md   |  9 +++++
 usermods/PIR_sensor_mqtt_v1/usermod.cpp | 53 +++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 usermods/PIR_sensor_mqtt_v1/README.md
 create mode 100644 usermods/PIR_sensor_mqtt_v1/usermod.cpp

diff --git a/usermods/PIR_sensor_mqtt_v1/README.md b/usermods/PIR_sensor_mqtt_v1/README.md
new file mode 100644
index 0000000000..475c11b025
--- /dev/null
+++ b/usermods/PIR_sensor_mqtt_v1/README.md
@@ -0,0 +1,9 @@
+# PIR sensor with MQTT
+
+This simple usermod allows attaching a PIR sensor like the AM312 and publish the readings over MQTT. A message is sent when motion is detected as well as when motion has stopped.
+
+This usermod has only been tested with the AM312 sensor though should work for any other PIR sensor. Note that this does not control the LED strip directly, it only publishes MQTT readings for use with other integrations like Home Assistant.
+
+## Installation
+
+Copy and replace the file `usermod.cpp` in wled00 directory.
diff --git a/usermods/PIR_sensor_mqtt_v1/usermod.cpp b/usermods/PIR_sensor_mqtt_v1/usermod.cpp
new file mode 100644
index 0000000000..117b7c7142
--- /dev/null
+++ b/usermods/PIR_sensor_mqtt_v1/usermod.cpp
@@ -0,0 +1,53 @@
+#include "wled.h"
+/*
+ * This v1 usermod file allows you to add own functionality to WLED more easily
+ * See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
+ * EEPROM bytes 2750+ are reserved for your custom use case. (if you extend #define EEPSIZE in const.h)
+ * If you just need 8 bytes, use 2551-2559 (you do not need to increase EEPSIZE)
+ * 
+ * Consider the v2 usermod API if you need a more advanced feature set!
+ */
+
+//Use userVar0 and userVar1 (API calls &U0=,&U1=, uint16_t)
+
+// PIR sensor pin
+const int MOTION_PIN = 16;
+
+int prevState = LOW;
+
+//gets called once at boot. Do all initialization that doesn't depend on network here
+void userSetup()
+{
+  pinMode(MOTION_PIN, INPUT);
+}
+
+//gets called every time WiFi is (re-)connected. Initialize own network interfaces here
+void userConnected()
+{
+
+}
+
+void publishMqtt(String state)
+{
+  //Check if MQTT Connected, otherwise it will crash the 8266
+  if (mqtt != nullptr){
+    char subuf[38];
+    strcpy(subuf, mqttDeviceTopic);
+    strcat(subuf, "/kitchen_motion");
+    mqtt->publish(subuf, 0, true, state.c_str());
+  }
+}
+
+//loop. You can use "if (WLED_CONNECTED)" to check for successful connection
+void userLoop()
+{
+  if (digitalRead(MOTION_PIN) == HIGH && prevState == LOW) { // Motion detected
+    publishMqtt("ON");
+    prevState = HIGH;
+  } 
+  if (digitalRead(MOTION_PIN) == LOW && prevState == HIGH) {  // Motion stopped
+    publishMqtt("OFF");
+    prevState = LOW;
+  }
+}
+

From 432755e05dad52d952c46afbae4fc2cba46372f5 Mon Sep 17 00:00:00 2001
From: Caleb Mah <calebmah@gmail.com>
Date: Fri, 17 Jul 2020 00:54:52 +0800
Subject: [PATCH 03/19] Use MQTT_TOPIC

---
 usermods/PIR_sensor_mqtt_v1/usermod.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usermods/PIR_sensor_mqtt_v1/usermod.cpp b/usermods/PIR_sensor_mqtt_v1/usermod.cpp
index 117b7c7142..426a80332b 100644
--- a/usermods/PIR_sensor_mqtt_v1/usermod.cpp
+++ b/usermods/PIR_sensor_mqtt_v1/usermod.cpp
@@ -12,6 +12,8 @@
 
 // PIR sensor pin
 const int MOTION_PIN = 16;
+ // MQTT topic for sensor values
+const char MQTT_TOPIC[] = "/motion";
 
 int prevState = LOW;
 
@@ -33,7 +35,7 @@ void publishMqtt(String state)
   if (mqtt != nullptr){
     char subuf[38];
     strcpy(subuf, mqttDeviceTopic);
-    strcat(subuf, "/kitchen_motion");
+    strcat(subuf, MQTT_TOPIC);
     mqtt->publish(subuf, 0, true, state.c_str());
   }
 }

From ec6a243e3e8ec793c23f845559c41ba0378fb1c2 Mon Sep 17 00:00:00 2001
From: Aircoookie <dev.aircoookie@gmail.com>
Date: Sun, 19 Jul 2020 16:24:26 +0200
Subject: [PATCH 04/19] Hostname alphanumeric (#1048)

* Use string derived from serverDescription for wifi.hostname()

The code was sending illegal hostname strings to WiFi.hostname() (which is then submitted to DHCP and often times to DNS.)  A valid hostname contains only alphanumeric characters and hyphens (though it can't start with a hypen.)  This change simply alters the value passed to wifi.hostname() by replacing all non alphanum chars with hyphens while ensuring the first char is never a hyphen.  If the resulting hostname is empty, it uses the escapedMac value (which I'm assuming is initialized by the time this code executes.)

This change would result issue #1033

* replace string with char array
prefix wled
improve documentation

Co-authored-by: garyd9 <garyd9@hotmail.com>
Co-authored-by: Gary Dezern <gdezern@internal.youforgot.net>
---
 CHANGELOG.md      |  4 +++-
 wled00/FX_fcn.cpp | 11 +++++++++++
 wled00/wled.cpp   | 30 ++++++++++++++++++++++++++++--
 wled00/wled.h     |  2 +-
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63271ad2d8..b02aef1f05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 ### Development versions after 0.10.0 release
 
-#### Build 2007020
+#### Build 2007190
+
+-   Fixed hostname containing illegal characters (#1035)
 
 #### Build 2006251
 
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 399df185b0..a1b4096cb1 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -801,6 +801,16 @@ void WS2812FX::handle_palette(void)
   }
 }
 
+
+/*
+ * Gets a single color from the currently selected palette.
+ * @param i Palette Index (if mapping is true, the full palette will be SEGLEN long, if false, 255). Will wrap around automatically.
+ * @param mapping if true, LED position in segment is considered for color
+ * @param wrap FastLED palettes will usally wrap back to the start smoothly. Set false to get a hard edge
+ * @param mcol If the default palette 0 is selected, return the standard color 0, 1 or 2 instead. If >2, Party palette is used instead
+ * @param pbri Value to scale the brightness of the returned color by. Default is 255. (no scaling)
+ * @returns Single color from palette
+ */
 uint32_t WS2812FX::color_from_palette(uint16_t i, bool mapping, bool wrap, uint8_t mcol, uint8_t pbri)
 {
   if (SEGMENT.palette == 0 && mcol < 3) return SEGCOLOR(mcol); //WS2812FX default
@@ -812,6 +822,7 @@ uint32_t WS2812FX::color_from_palette(uint16_t i, bool mapping, bool wrap, uint8
   return  fastled_col.r*65536 +  fastled_col.g*256 +  fastled_col.b;
 }
 
+//@returns `true` if color, mode, speed, intensity and palette match
 bool WS2812FX::segmentsAreIdentical(Segment* a, Segment* b)
 {
   //if (a->start != b->start) return false;
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 594c92252a..5869865497 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -324,15 +324,41 @@ void WLED::initConnection()
   DEBUG_PRINT(clientSSID);
   DEBUG_PRINTLN("...");
 
+  // convert the "serverDescription" into a valid DNS hostname (alphanumeric)
+  char hostname[25] = "wled-";
+  const char *pC = serverDescription;
+  uint8_t pos = 5;
+
+  while (*pC && pos < 24) { // while !null and not over length
+    if (isalnum(*pC)) {     // if the current char is alpha-numeric append it to the hostname
+      hostname[pos] = *pC;
+      pos++;
+    } else if (*pC == ' ' || *pC == '_' || *pC == '-' || *pC == '+' || *pC == '!' || *pC == '?' || *pC == '*') {
+      hostname[pos] = '-';
+      pos++;
+    }
+    // else do nothing - no leading hyphens and do not include hyphens for all other characters.
+    pC++;
+  }
+  // if the hostname is left blank, use the mac address/default mdns name
+  if (pos < 6) {
+    sprintf(hostname + 5, "%*s", 6, escapedMac.c_str() + 6);
+  } else { //last character must not be hyphen
+    while (pos > 0 && hostname[pos -1] == '-') {
+      hostname[pos -1] = 0;
+      pos--;
+    }
+  }
+  
 #ifdef ESP8266
-  WiFi.hostname(serverDescription);
+  WiFi.hostname(hostname);
 #endif
 
   WiFi.begin(clientSSID, clientPass);
 
 #ifdef ARDUINO_ARCH_ESP32
   WiFi.setSleep(!noWifiSleep);
-  WiFi.setHostname(serverDescription);
+  WiFi.setHostname(hostname);
 #else
   wifi_set_sleep_type((noWifiSleep) ? NONE_SLEEP_T : MODEM_SLEEP_T);
 #endif
diff --git a/wled00/wled.h b/wled00/wled.h
index fda93b52fd..fbe6ab0161 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2007020
+#define VERSION 2007190
 
 // ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS).
 

From 0ca6535345f458c31bc479d4e2cf84a09eb0aaaf Mon Sep 17 00:00:00 2001
From: garyd9 <garyd9@gmail.com>
Date: Fri, 24 Jul 2020 23:33:50 -0400
Subject: [PATCH 05/19] Fix for power on (T=1) resetting brightness. In
 particular, if parsing T=1, and the brightness is already non-0, don't do
 anything. Resolves presets set from macros don't restore brightness #1063

---
 wled00/set.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/set.cpp b/wled00/set.cpp
index afc152ac50..66dbb753e2 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -637,8 +637,8 @@ bool handleSet(AsyncWebServerRequest *request, const String& req)
     nightlightActive = false; //always disable nightlight when toggling
     switch (getNumVal(&req, pos))
     {
-      case 0: if (bri != 0){briLast = bri; bri = 0;} break; //off
-      case 1: bri = briLast; break; //on
+      case 0: if (bri != 0){briLast = bri; bri = 0;} break; //off, only if it was previously on
+      case 1: if (bri == 0) bri = briLast; break; //on, only if it was previously off
       default: toggleOnOff(); //toggle
     }
   }

From 35098c474cecaff316bccab7e6bf925a03ef8fbe Mon Sep 17 00:00:00 2001
From: juanesf <juanesf91@gmail.com>
Date: Mon, 27 Jul 2020 00:32:32 -0400
Subject: [PATCH 06/19] Update readme.md

- add link to Hyperion.NG
- add link to WLED App (Android & iOS)
---
 readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index fa1446b234..6063bc8b53 100644
--- a/readme.md
+++ b/readme.md
@@ -27,12 +27,12 @@ A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control
 - Configurable Auto Brightness limit for safer operation  
 
 ## 💡 Supported light control interfaces
-- WLED app for Android and iOS  
+- WLED app for [Android](https://play.google.com/store/apps/details?id=com.aircoookie.WLED) and [iOS](https://apps.apple.com/us/app/wled/id1475695033)
 - JSON and HTTP request APIs  
 - MQTT  
 - Blynk IoT  
 - E1.31  
-- Hyperion  
+- [Hyperion](https://github.com/hyperion-project/hyperion.ng)
 - UDP realtime  
 - Alexa voice control (including dimming and color)  
 - Sync to Philips hue lights  

From 3a4f4c8c3431062c09067aa9eafe67341c74ec50 Mon Sep 17 00:00:00 2001
From: Ted Schundler <tschundler@gmail.com>
Date: Sun, 2 Aug 2020 17:48:47 -0700
Subject: [PATCH 07/19] Fix multi-universe ArtNet output

The existing code was very buggy - a 512 channel ArtNet packet sent data to
171 LEDs, not 170. Also the second ArtNet universe was off-by-one.

The math was very confusing with so many branches. The reduces the
amount of code and amount of branching.

Tested with Resolume + my own ArtNet software + 252 LEDs for ArtNet.
Tested with LedFx for e1.31
---
 wled00/data/settings_sync.htm |  6 +--
 wled00/e131.cpp               | 75 ++++++++++++-----------------------
 2 files changed, 29 insertions(+), 52 deletions(-)

diff --git a/wled00/data/settings_sync.htm b/wled00/data/settings_sync.htm
index 42b493fae8..7c13650e93 100644
--- a/wled00/data/settings_sync.htm
+++ b/wled00/data/settings_sync.htm
@@ -2,7 +2,7 @@
 <html><head><meta name="viewport" content="width=500"><meta charset="utf-8"><title>Sync Settings</title>
 <script>var d=document;
 function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#sync-settings");}function B(){window.open("/settings","_self");}
-function adj(){if (d.Sf.DI.value == 6454) {if (d.Sf.DA.value == 1) d.Sf.DA.value = 0; if (d.Sf.EU.value == 1) d.Sf.EU.value = 0;} 
+function adj(){if (d.Sf.DI.value == 6454) {if (d.Sf.DA.value == 1) d.Sf.DA.value = 0; if (d.Sf.EU.value == 1) d.Sf.EU.value = 0;}
                else if (d.Sf.DI.value == 5568) {if (d.Sf.DA.value == 0) d.Sf.DA.value = 1; if (d.Sf.EU.value == 0) d.Sf.EU.value = 1;} }
 function SP(){var p = d.Sf.DI.value; d.getElementById("xp").style.display = (p > 0)?"none":"block"; if (p > 0) d.Sf.EP.value = p;}
 function SetVal(){switch(parseInt(d.Sf.EP.value)){case 5568: d.Sf.DI.value = 5568; break; case 6454: d.Sf.DI.value = 6454; break; }; SP();}
@@ -41,7 +41,7 @@ <h3>WLED Broadcast</h3>
 <h3>Realtime</h3>
 Receive UDP realtime: <input type="checkbox" name="RD"><br><br>
 <i>Network DMX input</i><br>
-Type: 
+Type:
 <select name=DI onchange="SP(); adj();">
 <option value=5568>E1.31 (sACN)</option>
 <option value=6454>Art-Net</option>
@@ -60,7 +60,7 @@ <h3>Realtime</h3>
 <option value=2>Single DRGB</option>
 <option value=3>Effect</option>
 <option value=4>Multi RGB</option>
-<option value=5>Multi DRGB</option>
+<option value=5>Dimmer + Multi RGB</option>
 </select><br>
 <a href="https://github.com/Aircoookie/WLED/wiki/E1.31-DMX" target="_blank">E1.31 info</a><br>
 Timeout: <input name="ET" type="number" min="1" max="65000" required> ms<br>
diff --git a/wled00/e131.cpp b/wled00/e131.cpp
index 3c68d375ff..05eff31d9d 100644
--- a/wled00/e131.cpp
+++ b/wled00/e131.cpp
@@ -1,5 +1,8 @@
 #include "wled.h"
 
+#define MAX_LEDS_PER_UNIVERSE 170
+#define MAX_CHANNELS_PER_UNIVERSE 512
+
 /*
  * E1.31 handler
  */
@@ -38,7 +41,6 @@ void handleE131Packet(e131_packet_t* p, IPAddress clientIP, bool isArtnet){
   if (uni >= (e131Universe + E131_MAX_UNIVERSE_COUNT)) return;
 
   uint8_t previousUniverses = uni - e131Universe;
-  uint16_t possibleLEDsInCurrentUniverse;
 
   if (e131SkipOutOfSequence)
     if (seq < e131LastSequenceNumber[uni-e131Universe] && seq > 20 && e131LastSequenceNumber[uni-e131Universe] < 250){
@@ -56,7 +58,7 @@ void handleE131Packet(e131_packet_t* p, IPAddress clientIP, bool isArtnet){
   // update status info
   realtimeIP = clientIP;
   byte wChannel = 0;
-  
+
   switch (DMXMode) {
     case DMX_MODE_DISABLED:
       return;  // nothing to do
@@ -115,57 +117,32 @@ void handleE131Packet(e131_packet_t* p, IPAddress clientIP, bool isArtnet){
       return;                                         // don't activate realtime live mode
       break;
 
-    case DMX_MODE_MULTIPLE_RGB:
-      realtimeLock(realtimeTimeoutMs, mde);
-      if (realtimeOverride) return;
-      if (previousUniverses == 0) {
-        // first universe of this fixture
-        possibleLEDsInCurrentUniverse = (dmxChannels - DMXAddress + 1) / 3;
-        for (uint16_t i = 0; i < ledCount; i++) {
-          if (i >= possibleLEDsInCurrentUniverse) break;  // more LEDs will follow in next universe(s)
-          setRealtimePixel(i, e131_data[DMXAddress+i*3+0], e131_data[DMXAddress+i*3+1], e131_data[DMXAddress+i*3+2], 0);
-        }
-      } else if (previousUniverses > 0 && uni < (e131Universe + E131_MAX_UNIVERSE_COUNT)) {
-        // additional universe(s) of this fixture
-        uint16_t numberOfLEDsInPreviousUniverses = ((512 - DMXAddress + 1) / 3);                            // first universe
-        if (previousUniverses > 1) numberOfLEDsInPreviousUniverses += (512 / 3) * (previousUniverses - 1);  // extended universe(s) before current
-        possibleLEDsInCurrentUniverse = dmxChannels / 3;
-        for (uint16_t i = numberOfLEDsInPreviousUniverses; i < ledCount; i++) {
-          uint8_t j = i - numberOfLEDsInPreviousUniverses;
-          if (j >= possibleLEDsInCurrentUniverse) break;   // more LEDs will follow in next universe(s)
-          setRealtimePixel(i, e131_data[j*3+1], e131_data[j*3+2], e131_data[j*3+3], 0);
-        }
-      }
-      break;
-
     case DMX_MODE_MULTIPLE_DRGB:
-      realtimeLock(realtimeTimeoutMs, mde);
-      if (realtimeOverride) return;
-      if (previousUniverses == 0) {
-        // first universe of this fixture
-        if (DMXOldDimmer != e131_data[DMXAddress+0]) {
-          DMXOldDimmer = e131_data[DMXAddress+0];
-          bri = e131_data[DMXAddress+0];
-          strip.setBrightness(bri);
-        }
-        possibleLEDsInCurrentUniverse = (dmxChannels - DMXAddress) / 3;
-        for (uint16_t i = 0; i < ledCount; i++) {
-          if (i >= possibleLEDsInCurrentUniverse) break;  // more LEDs will follow in next universe(s)
-          setRealtimePixel(i, e131_data[DMXAddress+i*3+1], e131_data[DMXAddress+i*3+2], e131_data[DMXAddress+i*3+3], 0);
+    case DMX_MODE_MULTIPLE_RGB:
+      {
+        realtimeLock(realtimeTimeoutMs, mde);
+        if (realtimeOverride) return;
+        uint16_t previousLEDs, dmxOffset;
+        if (previousUniverses == 0) {
+          if (dmxChannels-DMXAddress < 1) return;
+          dmxOffset = DMXAddress;
+          previousLEDs = 0;
+          // First DMX address is dimmer in DMX_MODE_MULTIPLE_DRGB mode.
+          if (DMXMode == DMX_MODE_MULTIPLE_DRGB) {
+              strip.setBrightness( e131_data[dmxOffset++]);
+          }
+        } else {
+          // All subsequent universes start at the first channel.
+          dmxOffset = isArtnet ? 0 : 1;
+          uint16_t possibleLEDsFirstUniverse = (MAX_CHANNELS_PER_UNIVERSE - DMXAddress) / 3;
+          previousLEDs = possibleLEDsFirstUniverse + (previousUniverses - 1) * MAX_LEDS_PER_UNIVERSE;
         }
-      } else if (previousUniverses > 0 && uni < (e131Universe + E131_MAX_UNIVERSE_COUNT)) {
-        // additional universe(s) of this fixture
-        uint16_t numberOfLEDsInPreviousUniverses = ((512 - DMXAddress + 1) / 3);                            // first universe
-        if (previousUniverses > 1) numberOfLEDsInPreviousUniverses += (512 / 3) * (previousUniverses - 1);  // extended universe(s) before current
-        possibleLEDsInCurrentUniverse = dmxChannels / 3;
-        for (uint16_t i = numberOfLEDsInPreviousUniverses; i < ledCount; i++) {
-          uint8_t j = i - numberOfLEDsInPreviousUniverses;
-          if (j >= possibleLEDsInCurrentUniverse) break;   // more LEDs will follow in next universe(s)
-          setRealtimePixel(i, e131_data[j*3+1], e131_data[j*3+2], e131_data[j*3+3], 0);
+        uint16_t ledCount = previousLEDs + (dmxChannels - dmxOffset) / 3;
+        for (uint16_t i = previousLEDs; i < ledCount; i++) {
+          setRealtimePixel(i, e131_data[dmxOffset++], e131_data[dmxOffset++], e131_data[dmxOffset++], 0);
         }
+        break;
       }
-      break;
-
     default:
       DEBUG_PRINTLN("unknown E1.31 DMX mode");
       return;  // nothing to do

From 7730a00dbba8ca3d9f7f3bc80a9a1b37b5e130a4 Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Mon, 3 Aug 2020 12:27:16 +0200
Subject: [PATCH 08/19] Rename local ledCount

---
 wled00/e131.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/wled00/e131.cpp b/wled00/e131.cpp
index 05eff31d9d..7f67aadbe7 100644
--- a/wled00/e131.cpp
+++ b/wled00/e131.cpp
@@ -109,8 +109,8 @@ void handleE131Packet(e131_packet_t* p, IPAddress clientIP, bool isArtnet){
       colSec[2]       = e131_data[DMXAddress+10];
       if (dmxChannels-DMXAddress+1 > 11)
       {
-        col[3]          = e131_data[DMXAddress+11]; //white
-        colSec[3]       = e131_data[DMXAddress+12];
+        col[3]        = e131_data[DMXAddress+11]; //white
+        colSec[3]     = e131_data[DMXAddress+12];
       }
       transitionDelayTemp = 0;                        // act fast
       colorUpdated(NOTIFIER_CALL_MODE_NOTIFICATION);  // don't send UDP
@@ -122,23 +122,23 @@ void handleE131Packet(e131_packet_t* p, IPAddress clientIP, bool isArtnet){
       {
         realtimeLock(realtimeTimeoutMs, mde);
         if (realtimeOverride) return;
-        uint16_t previousLEDs, dmxOffset;
+        uint16_t previousLeds, dmxOffset;
         if (previousUniverses == 0) {
           if (dmxChannels-DMXAddress < 1) return;
           dmxOffset = DMXAddress;
-          previousLEDs = 0;
+          previousLeds = 0;
           // First DMX address is dimmer in DMX_MODE_MULTIPLE_DRGB mode.
           if (DMXMode == DMX_MODE_MULTIPLE_DRGB) {
-              strip.setBrightness( e131_data[dmxOffset++]);
+            strip.setBrightness(e131_data[dmxOffset++]);
           }
         } else {
           // All subsequent universes start at the first channel.
           dmxOffset = isArtnet ? 0 : 1;
-          uint16_t possibleLEDsFirstUniverse = (MAX_CHANNELS_PER_UNIVERSE - DMXAddress) / 3;
-          previousLEDs = possibleLEDsFirstUniverse + (previousUniverses - 1) * MAX_LEDS_PER_UNIVERSE;
+          uint16_t ledsInFirstUniverse = (MAX_CHANNELS_PER_UNIVERSE - DMXAddress) / 3;
+          previousLeds = ledsInFirstUniverse + (previousUniverses - 1) * MAX_LEDS_PER_UNIVERSE;
         }
-        uint16_t ledCount = previousLEDs + (dmxChannels - dmxOffset) / 3;
-        for (uint16_t i = previousLEDs; i < ledCount; i++) {
+        uint16_t ledsTotal = previousLeds + (dmxChannels - dmxOffset) / 3;
+        for (uint16_t i = previousLeds; i < ledsTotal; i++) {
           setRealtimePixel(i, e131_data[dmxOffset++], e131_data[dmxOffset++], e131_data[dmxOffset++], 0);
         }
         break;

From 47f24ac1516536cfdf51138fadc5815f7634c811 Mon Sep 17 00:00:00 2001
From: jbucky86 <47157305+jbucky86@users.noreply.github.com>
Date: Mon, 3 Aug 2020 12:37:25 -0400
Subject: [PATCH 09/19] dmx_htm_fixes (#1070)

* Update cdata.js

* Update html_settings.h

* Update settings.htm

* Update settings_dmx.htm

* Add %DMXMENU% to cdata.js

* Fix single % being treated as template in settings.htm

Co-authored-by: cschwinne <dev.aircoookie@gmail.com>
---
 package-lock.json            |  2 +-
 tools/cdata.js               |  4 ++++
 wled00/data/settings_dmx.htm |  7 +++++--
 wled00/dmx.cpp               |  4 ++++
 wled00/html_settings.h       | 22 +++++++++++-----------
 5 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d44c4c77f8..f22b3f956f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "wled",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/tools/cdata.js b/tools/cdata.js
index 4bf2bba3a7..3d1c79c75c 100644
--- a/tools/cdata.js
+++ b/tools/cdata.js
@@ -202,6 +202,10 @@ writeChunks(
       append: ")=====",
       method: "plaintext",
       filter: "html-minify",
+      mangle: (str) =>
+        str
+          .replace("%", "%%")
+          .replace(/User Interface\<\/button\>\<\/form\>/gms, "User Interface\<\/button\>\<\/form\>%DMXMENU%"),
     },
     {
       file: "settings_wifi.htm",
diff --git a/wled00/data/settings_dmx.htm b/wled00/data/settings_dmx.htm
index e8610062bc..5438b9e649 100644
--- a/wled00/data/settings_dmx.htm
+++ b/wled00/data/settings_dmx.htm
@@ -31,6 +31,9 @@
 function S(){GCH(15);GetV();mMap();}function H(){window.open("https://github.com/Aircoookie/WLED/wiki/DMX");}function B(){window.history.back();}
 function GetV(){}
 </script>
+<style>
+	@import url("style.css");
+</style>
 </head>
 <body onload="S()">
 <form id="form_s" name="Sf" method="post">
@@ -48,9 +51,9 @@ <h2>Imma firin ma lazer (if it has DMX support)</h2><!-- TODO: Change to somethi
 <div id="gapwarning" style="color: orange; display: none;">WARNING: Channel gap is lower than channels per fixture.<br />This will cause overlap.</div>
 <button type="button" onclick="location.href='/dmxmap';">DMX Map</button><br>
 DMX fixtures start LED: <input type="number" min="0" max="1500" name="SL">
-<h3>channel functions</h3>
+<h3>Channel functions</h3>
 <div id="dmxchannels"></div>
 <hr><button type="button" onclick="B()">Back</button><button type="submit">Save</button>
 </form>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/wled00/dmx.cpp b/wled00/dmx.cpp
index 7fef5666ac..33aeb5748f 100644
--- a/wled00/dmx.cpp
+++ b/wled00/dmx.cpp
@@ -62,6 +62,10 @@ void initDMX() {
   dmx.init(512);        // initialize with bus length
 }
 
+#if (LEDPIN == 2)
+  #pragma message "Pin conflict compiling with DMX and LEDs on pin 2. Please set a different LEDPIN."
+#endif
+
 #else
 void handleDMX() {}
 void initDMX() {}
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index 7291b5c9f0..94c11ce1bf 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -12,14 +12,14 @@ const char PAGE_settingsCss[] PROGMEM = R"=====(<style>body{font-family:Verdana,
 // Autogenerated from wled00/data/settings.htm, do not edit!!
 const char PAGE_settings[] PROGMEM = R"=====(<!DOCTYPE html><html><head><meta http-equiv="Content-Type" 
 content="text/html; charset=windows-1252"><title>WLED Settings</title><style>
-body{text-align:center;background:#222;height:100;margin:0}html{--h:11.55vh}button{background:#333;color:#fff;font-family:Verdana,Helvetica,sans-serif;border:.3ch solid #333;display:inline-block;font-size:8vmin;height:var(--h);width:95%;margin-top:2.4vh}
+body{text-align:center;background:#222;height:100;margin:0}html{--h:11.55vh}button{background:#333;color:#fff;font-family:Verdana,Helvetica,sans-serif;border:.3ch solid #333;display:inline-block;font-size:8vmin;height:var(--h);width:95%%;margin-top:2.4vh}
 </style><script>
 function BB(){window.frameElement&&(document.getElementById("b").style.display="none",document.documentElement.style.setProperty("--h","13.86vh"))}
 </script></head><body onload="BB()"><form action="/"><button type="submit" 
 id="b">Back</button></form><form action="/settings/wifi"><button type="submit">
 WiFi Setup</button></form><form action="/settings/leds"><button type="submit">
 LED Preferences</button></form><form action="/settings/ui"><button 
-type="submit">User Interface</button></form><form action="/settings/sync">
+type="submit">User Interface</button></form>%DMXMENU%<form action="/settings/sync">
 <button type="submit">Sync Interfaces</button></form><form 
 action="/settings/time"><button type="submit">Time & Macros</button></form><form
  action="/settings/sec"><button type="submit">Security & Updates</button></form>
@@ -136,14 +136,14 @@ onclick="B()">Back</button><button type="submit">Save</button></form></body>
 const char PAGE_settings_dmx[] PROGMEM = R"=====(<!DOCTYPE html><html><head><meta name="viewport" content="width=500"><meta 
 charset="utf-8"><title>DMX Settings</title><script>
 function GCH(n){for(d=document,d.getElementById("dmxchannels").innerHTML+="",i=0;i<n;i++)d.getElementById("dmxchannels").innerHTML+="<span id=CH"+(i+1)+"s >Channel "+(i+1)+": <select name=CH"+(i+1)+' id="CH'+(i+1)+'"><option value=0>Set to 0</option><option value=1>Red</option><option value=2>Green</option><option value=3>Blue</option><option value=4>White</option><option value=5>Shutter (Brightness)</option><option value=6>Set to 255</option></select></span><br />\n'}function mMap(){for(d=document,numCh=document.Sf.CN.value,numGap=document.Sf.CG.value,parseInt(numCh)>parseInt(numGap)?d.getElementById("gapwarning").style.display="block":d.getElementById("gapwarning").style.display="none",i=0;i<15;i++)i>=numCh?(d.getElementById("CH"+(i+1)+"s").style.opacity="0.5",d.getElementById("CH"+(i+1)).disabled=!0):(d.getElementById("CH"+(i+1)+"s").style.opacity="1",d.getElementById("CH"+(i+1)).disabled=!1)}function S(){GCH(15),GetV(),mMap()}function H(){window.open("https://github.com/Aircoookie/WLED/wiki/DMX")}function B(){window.history.back()}function GetV() {var d=document;
-</head><body onload="S()"><form id="form_s" name="Sf" method="post">
-<div class="helpB"><button type="button" onclick="H()">?</button></div><button 
-type="button" onclick="B()">Back</button><button type="submit">Save</button><hr>
-<h2>Imma firin ma lazer (if it has DMX support)</h2>Proxy Universe <input 
-name="PU" type="number" min="0" max="63999" required>
- from E1.31 to DMX (0=disabled)<br><i>
-This will disable the LED data output to DMX configurable below</i><br><br><i>
-Number of fixtures is taken from LED config page</i><br>
+%CSS%%SCSS%</head><body onload="S()"><form
+ id="form_s" name="Sf" method="post"><div class="helpB"><button type="button" 
+onclick="H()">?</button></div><button type="button" onclick="B()">Back</button>
+<button type="submit">Save</button><hr><h2>
+Imma firin ma lazer (if it has DMX support)</h2>Proxy Universe <input name="PU" 
+type="number" min="0" max="63999" required> from E1.31 to DMX (0=disabled)<br>
+<i>This will disable the LED data output to DMX configurable below</i><br><br>
+<i>Number of fixtures is taken from LED config page</i><br>
 Channels per fixture (15 max): <input type="number" min="1" max="15" name="CN" 
 maxlength="2" onchange="mMap()"><br>Start channel: <input type="number" min="1" 
 max="512" name="CS" maxlength="2"><br>Spacing between start channels: <input 
@@ -153,7 +153,7 @@ info</a> ]<br><div id="gapwarning" style="color:orange;display:none">
 WARNING: Channel gap is lower than channels per fixture.<br>
 This will cause overlap.</div><button type="button" 
 onclick='location.href="/dmxmap"'>DMX Map</button><br>DMX fixtures start LED: 
-<input type="number" min="0" max="1500" name="SL"><h3>channel functions</h3><div
+<input type="number" min="0" max="1500" name="SL"><h3>Channel functions</h3><div
  id="dmxchannels"></div><hr><button type="button" onclick="B()">Back</button>
 <button type="submit">Save</button></form></body></html>)=====";
 

From 2635a3edd08c58779fdf574e2b28f136933631f5 Mon Sep 17 00:00:00 2001
From: garyd9 <garyd9@gmail.com>
Date: Tue, 4 Aug 2020 09:32:54 -0400
Subject: [PATCH 10/19] rename global var "local" to "localTime"

---
 wled00/ntp.cpp     | 26 +++++++++++++-------------
 wled00/overlay.cpp | 22 +++++++++++-----------
 wled00/wled.h      |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/wled00/ntp.cpp b/wled00/ntp.cpp
index 4836ed344f..5a79629678 100644
--- a/wled00/ntp.cpp
+++ b/wled00/ntp.cpp
@@ -142,24 +142,24 @@ bool checkNTPResponse()
 void updateLocalTime()
 {
   unsigned long tmc = now()+ utcOffsetSecs;
-  local = timezones[currentTimezone]->toLocal(tmc);
+  localTime = timezones[currentTimezone]->toLocal(tmc);
 }
 
 void getTimeString(char* out)
 {
   updateLocalTime();
-  byte hr = hour(local);
+  byte hr = hour(localTime);
   if (useAMPM)
   {
     if (hr > 11) hr -= 12;
     if (hr == 0) hr  = 12;
   }
-  sprintf(out,"%i-%i-%i, %i:%s%i:%s%i",year(local), month(local), day(local), 
-                                       hr,(minute(local)<10)?"0":"",minute(local),
-                                       (second(local)<10)?"0":"",second(local));
+  sprintf(out,"%i-%i-%i, %i:%s%i:%s%i",year(localTime), month(localTime), day(localTime), 
+                                       hr,(minute(localTime)<10)?"0":"",minute(localTime),
+                                       (second(localTime)<10)?"0":"",second(localTime));
   if (useAMPM)
   {
-    strcat(out,(hour(local) > 11)? " PM":" AM");
+    strcat(out,(hour(localTime) > 11)? " PM":" AM");
   }
 }
 
@@ -173,9 +173,9 @@ void setCountdown()
 bool checkCountdown()
 {
   unsigned long n = now();
-  if (countdownMode) local = countdownTime - n + utcOffsetSecs;
+  if (countdownMode) localTime = countdownTime - n + utcOffsetSecs;
   if (n > countdownTime) {
-    if (countdownMode) local = n - countdownTime + utcOffsetSecs;
+    if (countdownMode) localTime = n - countdownTime + utcOffsetSecs;
     if (!countdownOverTriggered)
     {
       if (macroCountdown != 0) applyMacro(macroCountdown);
@@ -188,21 +188,21 @@ bool checkCountdown()
 
 byte weekdayMondayFirst()
 {
-  byte wd = weekday(local) -1;
+  byte wd = weekday(localTime) -1;
   if (wd == 0) wd = 7;
   return wd;
 }
 
 void checkTimers()
 {
-  if (lastTimerMinute != minute(local)) //only check once a new minute begins
+  if (lastTimerMinute != minute(localTime)) //only check once a new minute begins
   {
-    lastTimerMinute = minute(local);
+    lastTimerMinute = minute(localTime);
     for (uint8_t i = 0; i < 8; i++)
     {
       if (timerMacro[i] != 0
-          && (timerHours[i] == hour(local) || timerHours[i] == 24) //if hour is set to 24, activate every hour 
-          && timerMinutes[i] == minute(local)
+          && (timerHours[i] == hour(localTime) || timerHours[i] == 24) //if hour is set to 24, activate every hour 
+          && timerMinutes[i] == minute(localTime)
           && (timerWeekday[i] & 0x01) //timer is enabled
           && timerWeekday[i] >> weekdayMondayFirst() & 0x01) //timer should activate at current day of week
       {
diff --git a/wled00/overlay.cpp b/wled00/overlay.cpp
index ceb6fc209f..cbb94c014b 100644
--- a/wled00/overlay.cpp
+++ b/wled00/overlay.cpp
@@ -40,10 +40,10 @@ void _overlayAnalogClock()
   {
     _overlayAnalogCountdown(); return;
   }
-  double hourP = ((double)(hour(local)%12))/12;
-  double minuteP = ((double)minute(local))/60;
+  double hourP = ((double)(hour(localTime)%12))/12;
+  double minuteP = ((double)minute(localTime))/60;
   hourP = hourP + minuteP/12;
-  double secondP = ((double)second(local))/60;
+  double secondP = ((double)second(localTime))/60;
   int hourPixel = floor(analogClock12pixel + overlaySize*hourP);
   if (hourPixel > overlayMax) hourPixel = overlayMin -1 + hourPixel - overlayMax;
   int minutePixel = floor(analogClock12pixel + overlaySize*minuteP);
@@ -279,13 +279,13 @@ void setCronixie()
 
 void _overlayCronixie()
 {
-  byte h = hour(local);
+  byte h = hour(localTime);
   byte h0 = h;
-  byte m = minute(local);
-  byte s = second(local);
-  byte d = day(local);
-  byte mi = month(local);
-  int y = year(local);
+  byte m = minute(localTime);
+  byte s = second(localTime);
+  byte d = day(localTime);
+  byte mi = month(localTime);
+  int y = year(localTime);
   //this has to be changed in time for 22nd century
   y -= 2000; if (y<0) y += 30; //makes countdown work
 
@@ -310,7 +310,7 @@ void _overlayCronixie()
           case 24: _digitOut[i] = m/10; break; //M
           case 30: _digitOut[i] = s/10; break; //S
           
-          case 43: _digitOut[i] = weekday(local); _digitOut[i]--; if (_digitOut[i]<1) _digitOut[i]= 7; break; //D
+          case 43: _digitOut[i] = weekday(localTime); _digitOut[i]--; if (_digitOut[i]<1) _digitOut[i]= 7; break; //D
           case 44: _digitOut[i] = d/10; _digitOut[i+1] = d- _digitOut[i]*10; i++; break; //DD
           case 40: _digitOut[i] = mi/10; _digitOut[i+1] = mi- _digitOut[i]*10; i++; break; //II
           case 37: _digitOut[i] = y/10; _digitOut[i+1] = y- _digitOut[i]*10; i++; break; //YY
@@ -331,7 +331,7 @@ void _overlayCronixie()
           //case 65: _digitOut[i+1] = (h0>17 || (h0>5 && h0<12))?1:10; i++; //bb
           case 64: _digitOut[i] = (h0>11)?1:10; break; //b
 
-          case 93: _digitOut[i] = weekday(local); _digitOut[i]--; if (_digitOut[i]<1) _digitOut[i]= 7; break; //d
+          case 93: _digitOut[i] = weekday(localTime); _digitOut[i]--; if (_digitOut[i]<1) _digitOut[i]= 7; break; //d
           case 94: _digitOut[i] = d/10; _digitOut[i+1] = d- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //dd
           case 90: _digitOut[i] = mi/10; _digitOut[i+1] = mi- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //ii
           case 87: _digitOut[i] = y/10; _digitOut[i+1] = y- _digitOut[i]*10; i++; break; //yy
diff --git a/wled00/wled.h b/wled00/wled.h
index fbe6ab0161..5e19d2de47 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -455,7 +455,7 @@ WLED_GLOBAL DNSServer dnsServer;
 
 // network time
 WLED_GLOBAL bool ntpConnected _INIT(false);
-WLED_GLOBAL time_t local _INIT(0);
+WLED_GLOBAL time_t localTime _INIT(0);
 WLED_GLOBAL unsigned long ntpLastSyncTime _INIT(999000000L);
 WLED_GLOBAL unsigned long ntpPacketSentTime _INIT(999000000L);
 WLED_GLOBAL IPAddress ntpServerIP;

From b50e798d55d42b86596cc8e4637849ba968f0510 Mon Sep 17 00:00:00 2001
From: twlare <38672507+twlare@users.noreply.github.com>
Date: Tue, 4 Aug 2020 09:50:16 -0700
Subject: [PATCH 11/19] Add segment mirror option

* Add segment mirror option (#1010)

* Update new pull with playlist and palette changes

* Revert "Update new pull with playlist and palette changes"

This reverts commit 9802a7c4e22d408337fc574e031dc49d4265fef3.
---
 wled00/FX.h       | 11 +++++++++--
 wled00/FX_fcn.cpp |  8 +++++++-
 wled00/const.h    |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 7afca48a48..da8a6942df 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -84,16 +84,19 @@
 
 // options
 // bit    7: segment is in transition mode
-// bits 3-6: TBD
+// bits 4-6: TBD
+// bit    3: mirror effect within segment
 // bit    2: segment is on
 // bit    1: reverse segment
 // bit    0: segment is selected
 #define NO_OPTIONS   (uint8_t)0x00
 #define TRANSITIONAL (uint8_t)0x80
+#define MIRROR       (uint8_t)0x08
 #define SEGMENT_ON   (uint8_t)0x04
 #define REVERSE      (uint8_t)0x02
 #define SELECTED     (uint8_t)0x01
 #define IS_TRANSITIONAL ((SEGMENT.options & TRANSITIONAL) == TRANSITIONAL)
+#define IS_MIRROR       ((SEGMENT.options & MIRROR      ) == MIRROR      )
 #define IS_SEGMENT_ON   ((SEGMENT.options & SEGMENT_ON  ) == SEGMENT_ON  )
 #define IS_REVERSE      ((SEGMENT.options & REVERSE     ) == REVERSE     )
 #define IS_SELECTED     ((SEGMENT.options & SELECTED    ) == SELECTED    )
@@ -264,7 +267,11 @@ class WS2812FX {
       uint16_t virtualLength()
       {
         uint16_t groupLen = groupLength();
-        return (length() + groupLen -1) / groupLen;
+        uint16_t vLength;
+        vLength = (length() + groupLen - 1) / groupLen;
+        if (options & MIRROR)
+          vLength /= 2;  // divide by 2 if mirror; leaves a blank LED in the middle if length is odd
+        return vLength;
       }
     } segment;
 
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index a1b4096cb1..464e9d2aac 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -111,7 +111,11 @@ uint16_t WS2812FX::realPixelIndex(uint16_t i) {
 
   /* reverse just an individual segment */
   int16_t realIndex = iGroup;
-  if (IS_REVERSE) realIndex = SEGMENT.length() -iGroup -1;
+  if (IS_REVERSE)
+    if (IS_MIRROR)
+      realIndex = SEGMENT.length() / 2 - iGroup - 1;  //only need to index half the pixels
+    else
+      realIndex = SEGMENT.length() - iGroup - 1;
 
   realIndex += SEGMENT.start;
   /* Reverse the whole string */
@@ -177,6 +181,8 @@ void WS2812FX::setPixelColor(uint16_t i, byte r, byte g, byte b, byte w)
       if (indexSet < customMappingSize) indexSet = customMappingTable[indexSet];
       #endif
       if (indexSetRev >= SEGMENT.start && indexSetRev < SEGMENT.stop) bus->SetPixelColor(indexSet + skip, col);
+      if (IS_MIRROR)  //set the corresponding mirrored pixel
+        bus->SetPixelColor(SEGMENT.stop - (indexSet + skip) + SEGMENT.start - 1, col);
     }
   } else { //live data, etc.
     if (reverseMode) i = _length - 1 - i;
diff --git a/wled00/const.h b/wled00/const.h
index 1ec4caf588..ac3549b5f7 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -99,7 +99,7 @@
 #define SEG_OPTION_SELECTED       0
 #define SEG_OPTION_REVERSED       1
 #define SEG_OPTION_ON             2
-#define SEG_OPTION_PAUSED         3            //unused
+#define SEG_OPTION_MIRROR         3            //Indicates that the effect will be mirrored within the segment
 #define SEG_OPTION_NONUNITY       4            //Indicates that the effect does not use FRAMETIME or needs getPixelColor
 #define SEG_OPTION_TRANSITIONAL   7
 

From c1cab30daf2b826907d8ede0e9fb0229084c7501 Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Fri, 7 Aug 2020 00:50:19 +0200
Subject: [PATCH 12/19] Added `mi` property to APIs

---
 CHANGELOG.md      | 7 +++++++
 wled00/FX.h       | 5 ++---
 wled00/FX_fcn.cpp | 8 +++++---
 wled00/json.cpp   | 8 +++++---
 wled00/set.cpp    | 4 ++++
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b02aef1f05..95cf9e0210 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ### Development versions after 0.10.0 release
 
+#### Build 2008070
+
+-   Added segment mirroring (`mi` property) (#1017)
+-   Fixed DMX settings page not displayed (#1070)
+-   Fixed ArtNet multi universe and improve code style (#1076)
+-   Renamed global var `local` to `localTime` (#1078)
+
 #### Build 2007190
 
 -   Fixed hostname containing illegal characters (#1035)
diff --git a/wled00/FX.h b/wled00/FX.h
index da8a6942df..27b35f01d8 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -267,10 +267,9 @@ class WS2812FX {
       uint16_t virtualLength()
       {
         uint16_t groupLen = groupLength();
-        uint16_t vLength;
-        vLength = (length() + groupLen - 1) / groupLen;
+        uint16_t vLength = (length() + groupLen - 1) / groupLen;
         if (options & MIRROR)
-          vLength /= 2;  // divide by 2 if mirror; leaves a blank LED in the middle if length is odd
+          vLength = (vLength + 1) /2;  // divide by 2 if mirror, leave at least a signle LED
         return vLength;
       }
     } segment;
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 464e9d2aac..2e49f1d45b 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -180,9 +180,11 @@ void WS2812FX::setPixelColor(uint16_t i, byte r, byte g, byte b, byte w)
       #ifdef WLED_CUSTOM_LED_MAPPING
       if (indexSet < customMappingSize) indexSet = customMappingTable[indexSet];
       #endif
-      if (indexSetRev >= SEGMENT.start && indexSetRev < SEGMENT.stop) bus->SetPixelColor(indexSet + skip, col);
-      if (IS_MIRROR)  //set the corresponding mirrored pixel
-        bus->SetPixelColor(SEGMENT.stop - (indexSet + skip) + SEGMENT.start - 1, col);
+      if (indexSetRev >= SEGMENT.start && indexSetRev < SEGMENT.stop) {
+        bus->SetPixelColor(indexSet + skip, col);
+        if (IS_MIRROR)  //set the corresponding mirrored pixel
+          bus->SetPixelColor(SEGMENT.stop - (indexSet + skip) + SEGMENT.start - 1, col);
+      }
     }
   } else { //live data, etc.
     if (reverseMode) i = _length - 1 - i;
diff --git a/wled00/json.cpp b/wled00/json.cpp
index 0a64f192c9..40dd3f24dd 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -59,6 +59,7 @@ void deserializeSegment(JsonObject elem, byte it)
     //if (pal != seg.palette && pal < strip.getPaletteCount()) strip.setPalette(pal);
     seg.setOption(SEG_OPTION_SELECTED, elem["sel"] | seg.getOption(SEG_OPTION_SELECTED));
     seg.setOption(SEG_OPTION_REVERSED, elem["rev"] | seg.getOption(SEG_OPTION_REVERSED));
+    seg.setOption(SEG_OPTION_MIRROR  , elem["mi"]  | seg.getOption(SEG_OPTION_MIRROR  ));
 
     //temporary, strip object gets updated via colorUpdated()
     if (id == strip.getMainSegmentId()) {
@@ -215,12 +216,13 @@ void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id)
     }
 	}
 
-	root["fx"] = seg.mode;
-	root["sx"] = seg.speed;
-	root["ix"] = seg.intensity;
+	root["fx"]  = seg.mode;
+	root["sx"]  = seg.speed;
+	root["ix"]  = seg.intensity;
 	root["pal"] = seg.palette;
 	root["sel"] = seg.isSelected();
 	root["rev"] = seg.getOption(SEG_OPTION_REVERSED);
+  root["mi"]  = seg.getOption(SEG_OPTION_MIRROR);
 }
 
 
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 66dbb753e2..763162f10a 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -647,6 +647,10 @@ bool handleSet(AsyncWebServerRequest *request, const String& req)
   pos = req.indexOf("RV=");
   if (pos > 0) strip.getSegment(main).setOption(SEG_OPTION_REVERSED, req.charAt(pos+3) != '0');
 
+  //Segment reverse
+  pos = req.indexOf("MI=");
+  if (pos > 0) strip.getSegment(main).setOption(SEG_OPTION_MIRROR, req.charAt(pos+3) != '0');
+
   //Segment brightness/opacity
   pos = req.indexOf("SB=");
   if (pos > 0) {

From 980794ea43d795b70c642fb1e47975dcfad2a401 Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Fri, 7 Aug 2020 16:06:54 +0200
Subject: [PATCH 13/19] Fix filetype in usermod documentation

---
 usermods/EXAMPLE_v2/readme.md  | 2 +-
 usermods/Temperature/readme.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/usermods/EXAMPLE_v2/readme.md b/usermods/EXAMPLE_v2/readme.md
index 09a8e55343..8917a1fba3 100644
--- a/usermods/EXAMPLE_v2/readme.md
+++ b/usermods/EXAMPLE_v2/readme.md
@@ -5,6 +5,6 @@ In this usermod file you can find the documentation on how to take advantage of
 ## Installation 
 
 Copy `usermod_v2_example.h` to the wled00 directory.  
-Uncomment the corresponding lines in `usermods_list.h` and compile!  
+Uncomment the corresponding lines in `usermods_list.cpp` and compile!  
 _(You shouldn't need to actually install this, it does nothing useful)_
 
diff --git a/usermods/Temperature/readme.md b/usermods/Temperature/readme.md
index ef2444473a..f6ce853294 100644
--- a/usermods/Temperature/readme.md
+++ b/usermods/Temperature/readme.md
@@ -8,7 +8,7 @@ This usermod will be expanded with support for different sensor types in the fut
 ## Installation
 
 Copy `usermod_temperature.h` to the wled00 directory.  
-Uncomment the corresponding lines in `usermods_list.h` and compile!  
+Uncomment the corresponding lines in `usermods_list.cpp` and compile!  
 If this is the only v2 usermod you plan to use, you can alternatively replace `usermods_list.h` in wled00 with the one in this folder.
 
 ## Project link

From 655fbf91e255f8550ee27636b4a17043e268b774 Mon Sep 17 00:00:00 2001
From: garyd9 <garyd9@gmail.com>
Date: Fri, 7 Aug 2020 15:14:55 -0400
Subject: [PATCH 14/19] create "sunrise and sunset" WLED usermod.

---
 usermods/UserModv2_SunRiseAndSet/README.md    |  15 ++
 .../UserMod_SunRiseAndSet.h                   | 155 ++++++++++++++++++
 2 files changed, 170 insertions(+)
 create mode 100644 usermods/UserModv2_SunRiseAndSet/README.md
 create mode 100644 usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h

diff --git a/usermods/UserModv2_SunRiseAndSet/README.md b/usermods/UserModv2_SunRiseAndSet/README.md
new file mode 100644
index 0000000000..e989f08906
--- /dev/null
+++ b/usermods/UserModv2_SunRiseAndSet/README.md
@@ -0,0 +1,15 @@
+WLED v2 UserMod for running macros at sunrise and sunset.
+
+At the time of this text, this user mod requires code to be changed to set certain variables:
+    1. To reflect the user's graphical location (latitude/longitude) used for calculating apparent sunrise/sunset
+    2. To specify which macros will be run at sunrise and/or sunset. (defaults to 15 at sunrise and 16 at sunset)
+    3. To optionally provide an offset from sunrise/sunset, in minutes (max of +/- 2 hours), when the macro will be run.
+
+In addition, WLED must be configured to get time from NTP (and the time must be retrieved via NTP.)
+
+Please open the UserMod_SunRiseAndSet.h file for instructions on what needs to be changed, where to copy files, etc.
+
+If this usermod proves useful enough, the code might eventually be updated to allow prompting for the required information
+via the web interface and to store settings in EEPROM instead of hard-coding in the .h file.
+
+This usermod has only been tested on the esp32dev platform, but there's no reason it wouldn't work on other platforms.
diff --git a/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h b/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
new file mode 100644
index 0000000000..623b4bb443
--- /dev/null
+++ b/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
@@ -0,0 +1,155 @@
+#pragma once
+
+#include "wled.h"
+#include <Dusk2Dawn.h>
+
+/*
+ * 
+ * REQUIREMENTS:
+ *      The Dusk2Dawn library must be installed.  This can be found at https://github.com/dmkishi/Dusk2Dawn.  The 1.0.1 version of this library found via
+ *      Arduino or platformio library managers is buggy and won't compile.  The latest version from github should be used.
+ * 
+ *      NTP must be enabled and functional.  It simply makes no sense to have events on sunrise/sunset when an accurate time isn't available.
+ * 
+ *      The user's geographical latitude and longitude must be configured (in decimal, not degrees/minutes/etc) using m_fLatitude and m_fLongitude
+ * 
+ *      if desired, an offset of up to +/- 2 hours can be specified for each of sunrise/sunset using m_sunriseOffset and m_sunsetOffset (defaults to 0)
+ * 
+ *      The specific macro to run at sunrise and/or sunset can be changed using m_sunriseMacro and m_sunsetMacro. (defaults to 15 and 16)
+ * 
+ *      From the Dusk2Dawn library:
+ *          HINT: An easy way to find the longitude and latitude for any location is
+ *          to find the spot in Google Maps, right click the place on the map, and
+ *          select "What's here?". At the bottom, you’ll see a card with the
+ *          coordinates.
+ * 
+ *      Once configured, copy UserMod_SunRiseAndSet.h to the sketch file (the same folder as wled00.ino exists), 
+ *      and then edit "usermods_list.cpp":
+ *          Add '#include "UserMod_SunRiseAndSet.h"' in the 'includes' area
+ *          Add 'usermods.add(new UserMod_SunRiseAndSet());' in the registerUsermods() area
+ * 
+ */
+
+class UserMod_SunRiseAndSet : public Usermod 
+{
+private:    
+
+    /**** USER SETTINGS ****/
+
+    float m_fLatitude = 40.6;       // latitude where sunrise/set are calculated
+    float m_fLongitude = -79.80;    // longitude where sunrise/set are calculated
+    int8_t m_sunriseOffset = 0;     // offset from sunrise, in minutes, when macro should be run (negative for before sunrise, positive for after sunrise)
+    int8_t m_sunsetOffset = 0;      // offset from sunset, in minutes, when macro should be run (negative for before sunset, positive for after sunset)
+    uint8_t m_sunriseMacro = 15;    // macro number to run at sunrise
+    uint8_t m_sunsetMacro = 16;     // macro number to run at sunset
+
+    /**** END OF USER SETTINGS.  DO NOT EDIT BELOW THIS LINE! ****/
+    
+
+    Dusk2Dawn *m_pD2D = NULL;         // this must be dynamically allocated in order for parameters to be loaded from EEPROM
+    
+    int m_nUserSunrise = -1;        // time, in minutes from midnight, of sunrise    
+    int m_nUserSunset = -1;         // time, in minutes from midnight, of sunset
+
+    byte m_nLastRunMinute = -1;     // indicates what minute the userloop was last run - used so that the code only runs once per minute
+
+public:
+
+    virtual void setup(void)
+    {
+        /* TODO:  From EEPROM, load the following variables:
+        *
+        *   int16_t latitude16 = 4060;      // user provided latitude, multiplied by 100 and rounded
+        *   int16_t longitude16 = -7980;    // user provided longitude, multiplied by 100 and rounded.
+        *   int8_t  sunrise_offset = 0;     // number of minutes to offset the sunrise macro trigger (positive for minutes after sunrise, negative for minutes before)
+        *   int8_t  sunset_offset = 0;     // number of minutes to offset the sunset macro trigger (positive for minutes after sunset, negative for minutes before)
+        * 
+        *   then:
+        *       m_fLatitude = (float)latitude / 100.0;
+        *       m_fLongitude = (float)longitude / 100.0;
+        *       m_sunriseOffset = sunrise_offset;
+        *       m_sunsetOffset = sunset_offset;
+        */
+
+        if ((0.0 != m_fLatitude) || (0.0 != m_fLongitude))
+        {
+            m_pD2D = new Dusk2Dawn (m_fLatitude, m_fLongitude, 0 /* UTC */);
+            // can't really check for failures.  if the alloc fails, the mod just doesn't work.
+        }        
+    }        
+
+    void loop(void) 
+    {
+        // without NTP, or a configured lat/long, none of this stuff is going to work...  
+        // As an alternative, need to figure out how to determine if the user has manually set the clock or not.
+        if (m_pD2D && (999000000L != ntpLastSyncTime))
+        {
+            // to prevent needing to import all the timezone stuff from other modules, work completely in UTC
+            time_t timeUTC = now();
+            tmElements_t tmNow;
+            breakTime(timeUTC, tmNow);
+            int nCurMinute = tmNow.Minute;
+
+            if (m_nLastRunMinute != nCurMinute) //only check once a new minute begins
+            {
+                m_nLastRunMinute = nCurMinute;
+                int numMinutes = (60 * tmNow.Hour) + m_nLastRunMinute; // how many minutes into the day are we?
+
+                // check to see if sunrise/sunset should be re-determined.  Only do this if neither sunrise nor sunset 
+                // are set.  That happens when the device has just stated, and after both sunrise/sunset have already run.
+                if ((-1 == m_nUserSunrise) && (-1 == m_nUserSunset))
+                {                
+                    m_nUserSunrise = m_pD2D->sunrise(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false);
+                    m_nUserSunset = m_pD2D->sunset(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false);
+                    if (m_nUserSunrise > numMinutes) // has sunrise already passed?  if so, recompute for tomorrow
+                    {
+                        breakTime(timeUTC + (60*60*24), tmNow);
+                        m_nUserSunrise = m_pD2D->sunrise(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false);
+                        if (m_nUserSunset > numMinutes) // if sunset has also passed, recompute that as well
+                        {
+                            m_nUserSunset = m_pD2D->sunset(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false);
+                        }                    
+                    }
+
+                    {   // debug block..
+
+                        // for debugging, convert everything to "local" time
+                        updateLocalTime();
+                        int offset = (localTime - timeUTC) / 60;
+                        int srMin = m_nUserSunrise + offset;
+                        int ssMin = m_nUserSunset + offset;
+
+                        Serial.printf("NEXT SUNRISE:  %d:%d\n", srMin / 60, srMin % 60);
+                        Serial.printf("NEXT SUNSET:   %d:%d\n", ssMin / 60, ssMin % 60);
+                    }   // end debug block
+
+                    // offset by user provided values.  becuase the offsets are signed bytes, the max offset is just over 2 hours.
+                    m_nUserSunrise += m_sunriseOffset;
+                    m_nUserSunset += m_sunsetOffset;
+                }
+
+                if (numMinutes == m_nUserSunrise)     // Good Morning!
+                {
+                    if (m_sunriseMacro)
+                        applyMacro(m_sunriseMacro); // run macro 15
+                    m_nUserSunrise = -1;
+                }
+                else if (numMinutes == m_nUserSunset)  // Good Night!
+                {
+                    if (m_sunsetMacro)                    
+                        applyMacro(m_sunsetMacro); // run macro 16
+                    m_nUserSunset = -1;
+                }
+            } // if (m_nLastRunMinute != nCurMinute)
+        }  // if (m_pD2D && (999000000L != ntpLastSyncTime))
+    }
+
+
+    ~UserMod_SunRiseAndSet(void)
+    {
+        if (m_pD2D) delete m_pD2D;
+    }
+};
+
+
+

From 18ab2b3ab5b6b035ba64a129433f41355b92ef78 Mon Sep 17 00:00:00 2001
From: garyd9 <garyd9@gmail.com>
Date: Fri, 7 Aug 2020 15:21:45 -0400
Subject: [PATCH 15/19] #if0 out a debug block that can be used to validate the
 sunrise/sunset times.

---
 usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h b/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
index 623b4bb443..f1d448890e 100644
--- a/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
+++ b/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
@@ -110,7 +110,7 @@ class UserMod_SunRiseAndSet : public Usermod
                             m_nUserSunset = m_pD2D->sunset(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false);
                         }                    
                     }
-
+#if 0
                     {   // debug block..
 
                         // for debugging, convert everything to "local" time
@@ -122,7 +122,7 @@ class UserMod_SunRiseAndSet : public Usermod
                         Serial.printf("NEXT SUNRISE:  %d:%d\n", srMin / 60, srMin % 60);
                         Serial.printf("NEXT SUNSET:   %d:%d\n", ssMin / 60, ssMin % 60);
                     }   // end debug block
-
+#endif
                     // offset by user provided values.  becuase the offsets are signed bytes, the max offset is just over 2 hours.
                     m_nUserSunrise += m_sunriseOffset;
                     m_nUserSunset += m_sunsetOffset;

From 993a5805cdce82556aafd3bd1016b969f02e6b44 Mon Sep 17 00:00:00 2001
From: garyd9 <garyd9@gmail.com>
Date: Sun, 9 Aug 2020 13:40:12 -0400
Subject: [PATCH 16/19] Add sunrise/set times to json state

---
 .../UserMod_SunRiseAndSet.h                     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h b/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
index f1d448890e..de92a7a534 100644
--- a/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
+++ b/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
@@ -144,6 +144,23 @@ class UserMod_SunRiseAndSet : public Usermod
         }  // if (m_pD2D && (999000000L != ntpLastSyncTime))
     }
 
+   void addToJsonState(JsonObject& root)
+    {
+        JsonObject user = root["SunRiseAndSet"];
+        if (user.isNull()) user = root.createNestedObject("SunRiseAndSet");
+
+        char buf[10];
+        if (-1 != m_nUserSunrise)
+        {
+            snprintf(buf, 10, "%02d:%02d UTC", m_nUserSunrise / 60, m_nUserSunrise % 60);
+            user["rise"] = buf;
+        }
+        if (-1 != m_nUserSunset)
+        {
+            snprintf(buf, 10, "%02d:%02d UTC", m_nUserSunset / 60, m_nUserSunset % 60);
+            user["set"] = buf;
+        }
+    }
 
     ~UserMod_SunRiseAndSet(void)
     {

From 39682a4cf1c427f149285593175dd19129a326b2 Mon Sep 17 00:00:00 2001
From: garyd9 <garyd9@gmail.com>
Date: Sun, 9 Aug 2020 13:55:40 -0400
Subject: [PATCH 17/19] add more vars to json state

---
 usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h b/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
index de92a7a534..a22c17fb29 100644
--- a/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
+++ b/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
@@ -160,6 +160,13 @@ class UserMod_SunRiseAndSet : public Usermod
             snprintf(buf, 10, "%02d:%02d UTC", m_nUserSunset / 60, m_nUserSunset % 60);
             user["set"] = buf;
         }
+        JsonObject vars = user.createNestedObject("vars");
+        vars["lat"] = m_fLatitude;
+        vars["long"] = m_fLongitude;
+        vars["rise_mac"] = m_sunriseMacro;
+        vars["set_mac"] = m_sunsetMacro;
+        vars["rise_off"] = m_sunriseOffset;
+        vars["set_off"] = m_sunsetMacro;
     }
 
     ~UserMod_SunRiseAndSet(void)

From 1da539ef056fb0b2257e5ec182cd1f3d9de91a8c Mon Sep 17 00:00:00 2001
From: garyd9 <garyd9@gmail.com>
Date: Sun, 9 Aug 2020 21:58:27 -0400
Subject: [PATCH 18/19] couple of bug fixes Fix a typo in one of the json vars
 Fix an odd issue that would occur if sunrise or sunset occurs in the first
 hour after midnight UTC.  (The Dusk2Dawn lib would return a value greater
 than 1440.)

---
 .../UserMod_SunRiseAndSet.h                   | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h b/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
index a22c17fb29..62176ce920 100644
--- a/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
+++ b/usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
@@ -99,30 +99,17 @@ class UserMod_SunRiseAndSet : public Usermod
                 // are set.  That happens when the device has just stated, and after both sunrise/sunset have already run.
                 if ((-1 == m_nUserSunrise) && (-1 == m_nUserSunset))
                 {                
-                    m_nUserSunrise = m_pD2D->sunrise(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false);
-                    m_nUserSunset = m_pD2D->sunset(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false);
+                    m_nUserSunrise = m_pD2D->sunrise(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false) % 1440;
+                    m_nUserSunset = m_pD2D->sunset(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false) % 1440;
                     if (m_nUserSunrise > numMinutes) // has sunrise already passed?  if so, recompute for tomorrow
                     {
                         breakTime(timeUTC + (60*60*24), tmNow);
-                        m_nUserSunrise = m_pD2D->sunrise(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false);
+                        m_nUserSunrise = m_pD2D->sunrise(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false) % 1440;
                         if (m_nUserSunset > numMinutes) // if sunset has also passed, recompute that as well
                         {
-                            m_nUserSunset = m_pD2D->sunset(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false);
+                            m_nUserSunset = m_pD2D->sunset(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false) % 1440;
                         }                    
                     }
-#if 0
-                    {   // debug block..
-
-                        // for debugging, convert everything to "local" time
-                        updateLocalTime();
-                        int offset = (localTime - timeUTC) / 60;
-                        int srMin = m_nUserSunrise + offset;
-                        int ssMin = m_nUserSunset + offset;
-
-                        Serial.printf("NEXT SUNRISE:  %d:%d\n", srMin / 60, srMin % 60);
-                        Serial.printf("NEXT SUNSET:   %d:%d\n", ssMin / 60, ssMin % 60);
-                    }   // end debug block
-#endif
                     // offset by user provided values.  becuase the offsets are signed bytes, the max offset is just over 2 hours.
                     m_nUserSunrise += m_sunriseOffset;
                     m_nUserSunset += m_sunsetOffset;
@@ -166,7 +153,7 @@ class UserMod_SunRiseAndSet : public Usermod
         vars["rise_mac"] = m_sunriseMacro;
         vars["set_mac"] = m_sunsetMacro;
         vars["rise_off"] = m_sunriseOffset;
-        vars["set_off"] = m_sunsetMacro;
+        vars["set_off"] = m_sunsetOffset;
     }
 
     ~UserMod_SunRiseAndSet(void)

From 5a4b7199959e6bc60200717fa46915555acdac10 Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Mon, 10 Aug 2020 23:35:18 +0200
Subject: [PATCH 19/19] Fixed Auto White mode setting (fixes #1088)

---
 CHANGELOG.md                  |  4 +++
 wled00/data/settings_leds.htm | 10 ++++++-
 wled00/html_settings.h        | 56 ++++++++++++++++++-----------------
 wled00/wled.h                 |  2 +-
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95cf9e0210..8aed6836a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### Development versions after 0.10.0 release
 
+#### Build 2008100
+
+-   Fixed Auto White calculation dropdown (fixed #1088)
+
 #### Build 2008070
 
 -   Added segment mirroring (`mi` property) (#1017)
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 75795b870c..e57b09a496 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -130,7 +130,15 @@ <h2>LED setup</h2>
     <br>
 		LEDs are 4-channel type (RGBW): <input type="checkbox" name="EW" onchange=UI() id="rgbw"><br>
     <span class="wc">
-		Auto-calculate white channel from RGB: <input type="checkbox" name="AW"><br></span>
+    Auto-calculate white channel from RGB:<br>
+    <select name=AW>
+      <option value=0>None</option>
+      <option value=1>Brighter</option>
+      <option value=2>Accurate</option>
+      <option value=3>Dual</option>
+      <option value=4>Legacy</option>
+    </select>
+    <br></span>
 		Color order:
 		<select name="CO">
 			<option value=0>GRB</option>
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index 94c11ce1bf..21970e600b 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -100,32 +100,34 @@ id="la" oninput="UI()" required> mA<br></span><i>
 Keep at default if you are unsure about your type of LEDs.</i><br></div><br>
 LEDs are 4-channel type (RGBW): <input type="checkbox" name="EW" 
 onchange="UI()" id="rgbw"><br><span class="wc">
-Auto-calculate white channel from RGB: <input type="checkbox" name="AW"><br>
-</span>Color order: <select name="CO"><option value="0">GRB</option><option 
-value="1">RGB</option><option value="2">BRG</option><option value="3">RBG
-</option><option value="4">BGR</option><option value="5">GBR</option></select>
-<h3>Defaults</h3>Turn LEDs on after power up/reset: <input type="checkbox" 
-name="BO"><br>Default brightness: <input name="CA" type="number" min="0" 
-max="255" required> (0-255)<br><br>Apply preset <input name="BP" type="number" 
-min="0" max="16" required> at boot (0 uses defaults)<br>- <i>or</i> -<br>
-Set current preset cycle setting as boot default: <input type="checkbox" 
-name="PC"><br><br>Use Gamma correction for color: <input type="checkbox" 
-name="GC"> (strongly recommended)<br>Use Gamma correction for brightness: <input
- type="checkbox" name="GB"> (not recommended)<br><br>Brightness factor: <input 
-name="BF" type="number" min="1" max="255" required> %<h3>Transitions</h3>
-Crossfade: <input type="checkbox" name="TF"><br>Transition Time: <input 
-name="TD" maxlength="5" size="2"> ms<br>Enable Palette transitions: <input 
-type="checkbox" name="PF"><h3>Timed light</h3>Default Duration: <input 
-name="TL" type="number" min="1" max="255" required> min<br>
-Default Target brightness: <input name="TB" type="number" min="0" max="255" 
-required><br>Mode: <select name="TW"><option value="0">Wait and set</option>
-<option value="1">Fade</option><option value="2">Fade Color</option><option 
-value="3">Sunrise</option></select><h3>Advanced</h3>Palette blending: <select 
-name="PB"><option value="0">Linear (wrap if moving)</option><option value="1">
-Linear (always wrap)</option><option value="2">Linear (never wrap)</option>
-<option value="3">None (not recommended)</option></select><br>
-Reverse LED order (rotate 180): <input type="checkbox" name="RV"><br>
-Skip first LED: <input type="checkbox" name="SL"><hr><button type="button" 
+Auto-calculate white channel from RGB:<br><select name="AW"><option value="0">
+None</option><option value="1">Brighter</option><option value="2">Accurate
+</option><option value="3">Dual</option><option value="4">Legacy</option>
+</select><br></span>Color order: <select name="CO"><option value="0">GRB
+</option><option value="1">RGB</option><option value="2">BRG</option><option 
+value="3">RBG</option><option value="4">BGR</option><option value="5">GBR
+</option></select><h3>Defaults</h3>Turn LEDs on after power up/reset: <input 
+type="checkbox" name="BO"><br>Default brightness: <input name="CA" 
+type="number" min="0" max="255" required> (0-255)<br><br>Apply preset <input 
+name="BP" type="number" min="0" max="16" required> at boot (0 uses defaults)<br>
+- <i>or</i> -<br>Set current preset cycle setting as boot default: <input 
+type="checkbox" name="PC"><br><br>Use Gamma correction for color: <input 
+type="checkbox" name="GC"> (strongly recommended)<br>
+Use Gamma correction for brightness: <input type="checkbox" name="GB">
+ (not recommended)<br><br>Brightness factor: <input name="BF" type="number" 
+min="1" max="255" required> %<h3>Transitions</h3>Crossfade: <input 
+type="checkbox" name="TF"><br>Transition Time: <input name="TD" maxlength="5" 
+size="2"> ms<br>Enable Palette transitions: <input type="checkbox" name="PF">
+<h3>Timed light</h3>Default Duration: <input name="TL" type="number" min="1" 
+max="255" required> min<br>Default Target brightness: <input name="TB" 
+type="number" min="0" max="255" required><br>Mode: <select name="TW"><option 
+value="0">Wait and set</option><option value="1">Fade</option><option value="2">
+Fade Color</option><option value="3">Sunrise</option></select><h3>Advanced</h3>
+Palette blending: <select name="PB"><option value="0">Linear (wrap if moving)
+</option><option value="1">Linear (always wrap)</option><option value="2">
+Linear (never wrap)</option><option value="3">None (not recommended)</option>
+</select><br>Reverse LED order (rotate 180): <input type="checkbox" name="RV">
+<br>Skip first LED: <input type="checkbox" name="SL"><hr><button type="button" 
 onclick="B()">Back</button><button type="submit">Save</button></form></body>
 </html>)=====";
 
@@ -213,7 +215,7 @@ type="checkbox" name="ES"><br>DMX start address: <input name="DA" type="number"
 min="0" max="510" required><br>DMX mode: <select name="DM"><option value="0">
 Disabled</option><option value="1">Single RGB</option><option value="2">
 Single DRGB</option><option value="3">Effect</option><option value="4">Multi RGB
-</option><option value="5">Multi DRGB</option></select><br><a 
+</option><option value="5">Dimmer + Multi RGB</option></select><br><a 
 href="https://github.com/Aircoookie/WLED/wiki/E1.31-DMX" target="_blank">
 E1.31 info</a><br>Timeout: <input name="ET" type="number" min="1" max="65000" 
 required> ms<br>Force max brightness: <input type="checkbox" name="FB"><br>
diff --git a/wled00/wled.h b/wled00/wled.h
index 5e19d2de47..a7a1c92b93 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2007190
+#define VERSION 2008100
 
 // ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS).