Release of v0.8.4

Default to LwiP 2 in PIO Fixed 12hr format time
Aircoookie · Mar 25, 2019 · 794e174 · 794e174
1 parent 238d711
commit 794e174
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 16 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -59,7 +59,7 @@ arduino_core_2_5_0 = [email protected]
 arduino_core_stage = https://github.com/platformio/platform-espressif8266.git#feature/stage
 platform = ${common:esp8266.arduino_core_2_4_2}
 build_flags =
-  -D PIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
+  -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
   -Wl,-Teagle.flash.4m1m.ld  ;;;; Required for core > v2.5.0 or staging version 4MB Flash 3MB SPIFFs
 
 [common:esp8266_1M]

diff --git a/readme.md b/readme.md
@@ -25,7 +25,7 @@ A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control
 
 ### Supported light control interfaces:
 - WLED Android app
-- HTTP request API
+- HTTP and JSON request APIs
 - Blynk IoT
 - MQTT
 - E1.31

diff --git a/wled00/data/settings_sec.htm b/wled00/data/settings_sec.htm
diff --git a/wled00/html_other.h b/wled00/html_other.h
@@ -20,7 +20,7 @@ const char PAGE_msg[] PROGMEM = R"=====(<!DOCTYPE html>
 const char PAGE_update[] PROGMEM = R"=====(<!DOCTYPE html>
 <html><head><meta content='width=device-width' name='viewport'><title>WLED Update</title><script>function B(){window.history.back()}</script>
 %CSS%.bt{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:.3ch solid var(--bCol);display:inline-block;filter:drop-shadow(-5px -5px 5px var(--sCol));font-size:20px;margin:8px;margin-top:12px}input[type=file]{font-size:16px}body{font-family:var(--cFn),sans-serif;text-align:center;background:var(--cCol);color:var(--tCol);line-height:200%%}</style></head>
-<body><h2>WLED Software Update</h2>Installed version: 0.8.4-dev<br>Download the latest binary: <a href="https://github.com/Aircoookie/WLED/releases"><img src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square"></a><br><form method='POST' action='/update' enctype='multipart/form-data'><input type='file' class="bt" name='update' required><br><input type='submit' class="bt" value='Update!'></form><button type="button" class="bt" onclick="B()">Back</button></body></html>)=====";
+<body><h2>WLED Software Update</h2>Installed version: 0.8.4<br>Download the latest binary: <a href="https://github.com/Aircoookie/WLED/releases"><img src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square"></a><br><form method='POST' action='/update' enctype='multipart/form-data'><input type='file' class="bt" name='update' required><br><input type='submit' class="bt" value='Update!'></form><button type="button" class="bt" onclick="B()">Back</button></body></html>)=====";
 
 
 //new user welcome page

diff --git a/wled00/html_settings.h b/wled00/html_settings.h
@@ -394,7 +394,7 @@ HTTP traffic is unencrypted. An attacker in the same network can intercept form
 <button type="button" onclick="U()">Manual OTA Update</button><br>
 Enable ArduinoOTA: <input type="checkbox" name="AO"><br>
 <h3>About</h3>
-<a href="https://github.com/Aircoookie/WLED" target="_blank">WLED</a> version 0.8.4-dev<br><br>
+<a href="https://github.com/Aircoookie/WLED" target="_blank">WLED</a> version 0.8.4<br><br>
 <a href="https://github.com/Aircoookie/WLED/wiki/Contributors-&-About" target="_blank">Contributors, dependencies and special thanks</a><br>
 A huge thank you to everyone who helped me create WLED!<br><br>
 (c) 2016-2019 Christian Schwinne <br>

diff --git a/wled00/wled00.ino b/wled00/wled00.ino
@@ -3,7 +3,7 @@
  */
 /*
  * @title WLED project sketch
- * @version 0.8.4-dev
+ * @version 0.8.4
  * @author Christian Schwinne
  */
 
@@ -98,8 +98,8 @@
 
 
 //version code in format yymmddb (b = daily build)
-#define VERSION 1903242
-char versionString[] = "0.8.4-dev";
+#define VERSION 1903252
+char versionString[] = "0.8.4";
 
 
 //AP and OTA default passwords (for maximum change them!)
@@ -161,7 +161,7 @@ byte briMultiplier =  100;                    //% of brightness to set (to limit
 
 //User Interface CONFIG
 char serverDescription[33] = "WLED Light";    //Name of module
-byte currentTheme = 0;                        //UI theme index for settings and classic UI
+byte currentTheme = 7;                        //UI theme index for settings and classic UI
 byte uiConfiguration = 0;                     //0: automatic (depends on user-agent) 1: classic UI 2: mobile UI
 bool useHSB = true;                           //classic UI: use HSB sliders instead of RGB by default
 char cssFont[33] = "Verdana";                 //font to use in classic UI
@@ -179,8 +179,8 @@ uint16_t udpRgbPort = 19446;                  //Hyperion port
 bool receiveNotificationBrightness = true;    //apply brightness from incoming notifications
 bool receiveNotificationColor      = true;    //apply color
 bool receiveNotificationEffects    = true;    //apply effects setup
-bool notifyDirect =  true;                    //send notification if change via UI or HTTP API
-bool notifyButton =  true;                    //send if updated by button or infrared remote
+bool notifyDirect = false;                    //send notification if change via UI or HTTP API
+bool notifyButton = false;                    //send if updated by button or infrared remote
 bool notifyAlexa  = false;                    //send notification if updated via Alexa
 bool notifyMacro  = false;                    //send notification for macro
 bool notifyHue    =  true;                    //send notification if Hue light changes

diff --git a/wled00/wled10_ntp.ino b/wled00/wled10_ntp.ino
@@ -126,9 +126,14 @@ void updateLocalTime()
 void getTimeString(char* out)
 {
   updateLocalTime();
+  byte hr = hour(local);
+  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), 
-                                       (useAMPM)? hour(local)%12:hour(local),
-                                       (minute(local)<10)?"0":"",minute(local),
+                                       hr,(minute(local)<10)?"0":"",minute(local),
                                        (second(local)<10)?"0":"",second(local));
   if (useAMPM)
   {

diff --git a/wled00/wled19_json.ino b/wled00/wled19_json.ino
@@ -40,14 +40,14 @@ void deserializeState(JsonObject& root)
     if (id < strip.getMaxSegments())
     {
       WS2812FX::Segment& seg = strip.getSegment(id);
-      uint16_t start = elem["start"] | seg.start;
+      /*uint16_t start = elem["start"] | seg.start;
       int stop = elem["stop"] | -1;
 
       if (stop < 0) {
         uint16_t len = elem["len"];
         stop = (len > 0) ? start + len : seg.stop;
       }
-      strip.setSegment(id, start, stop);
+      strip.setSegment(id, start, stop);*/
 
       JsonArray& colarr = elem["col"];
       if (colarr.success())
@@ -145,7 +145,7 @@ void serializeSegment(JsonObject& root)
   root["sx"] = seg.speed;
   root["ix"] = seg.intensity;
   root["pal"] = seg.palette;
-  root["sel"] = seg.getOption(0);
+  root["sel"] = true; //seg.getOption(0);
   root["rev"] = seg.getOption(1);
   root["cln"] = -1;
 }
@@ -211,7 +211,7 @@ void serializeInfo(JsonObject& root)
 
   root["brand"] = "WLED";
   root["product"] = "DIY light";
-  root["btype"] = "dev";
+  root["btype"] = "src";
   root["mac"] = escapedMac;
 }