diff --git a/platformio.ini b/platformio.ini index 9436161374..5402f53159 100644 --- a/platformio.ini +++ b/platformio.ini @@ -59,7 +59,7 @@ arduino_core_2_5_0 = espressif8266@2.0.4 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 index ca68f9854b..b4f54cc98f 100644 --- 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 index 6459a4a41f..cf45fa7aef 100644 Binary files a/wled00/data/settings_sec.htm and b/wled00/data/settings_sec.htm differ diff --git a/wled00/html_other.h b/wled00/html_other.h index 720b011680..79d43a8fa1 100644 --- a/wled00/html_other.h +++ b/wled00/html_other.h @@ -20,7 +20,7 @@ const char PAGE_msg[] PROGMEM = R"=====( const char PAGE_update[] PROGMEM = R"=====( WLED Update %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%%} -

WLED Software Update

Installed version: 0.8.4-dev
Download the latest binary:

)====="; +

WLED Software Update

Installed version: 0.8.4
Download the latest binary:

)====="; //new user welcome page diff --git a/wled00/html_settings.h b/wled00/html_settings.h index d376dc8758..b05d2f478f 100644 --- 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
Enable ArduinoOTA:

About

-WLED version 0.8.4-dev

+WLED version 0.8.4

Contributors, dependencies and special thanks
A huge thank you to everyone who helped me create WLED!

(c) 2016-2019 Christian Schwinne
diff --git a/wled00/wled00.ino b/wled00/wled00.ino index 34787ded3e..c29e623f66 100644 --- 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 index 49679119c7..efb46d6e94 100644 --- 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 index caa3dd829a..6ea3493397 100644 --- 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; }