Merge upstream master into sound reactive master

atuline · Sep 7, 2020 · c8e3c02 · c8e3c02
1 parent 4ccb567
commit c8e3c02
Show file tree

Hide file tree

Showing 11 changed files with 565 additions and 545 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,22 @@
 ## WLED changelog
 
-### Development versions after 0.10.0 release
+### Development versions after the 0.10.2 release
 
-#### Build 2008300 (v0.10.2 release candidate)
+#### Build 2009030
+
+-   Fixed bootloop if mDNS is used on builds without OTA support
+
+### WLED version 0.10.2
+
+#### Build 2008310
+
+-   Added new logo
+-   Maximum GZIP compression (#1126)
+-   Enable WebSockets by default
+
+### Development versions between 0.10.0 and 0.10.2 releases
+
+#### Build 2008300
 
 -   Added new UI customization options to UI settings
 -   Added Dancing Shadows effect (#1108)

diff --git a/images/wled_logo_akemi.png b/images/wled_logo_akemi.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wled",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "Tools for WLED project",
   "main": "tools/cdata.js",
   "directories": {

diff --git a/readme.md b/readme.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="/images/wled_logo.png">
+  <img src="/images/wled_logo_akemi.png">
   <a href="https://github.com/atuline/WLED/releases"><img src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square"></a>
   <a href="https://wled.discourse.group"><img src="https://img.shields.io/discourse/topics?colorB=blue&label=forum&server=https%3A%2F%2Fwled.discourse.group%2F&style=flat-square"></a>
   <a href="https://discord.gg/KuqP7NE"><img src="https://img.shields.io/discord/473448917040758787.svg?colorB=blue&label=discord&style=flat-square"></a>
@@ -68,12 +68,12 @@ A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control
 - JSON and HTTP request APIs
 - MQTT
 - Blynk IoT
-- E1.31
+- E1.31, Art-Net and TPM2.net
 - [Hyperion](https://github.com/hyperion-project/hyperion.ng)
 - UDP realtime
 - Alexa voice control (including dimming and color)
 - Sync to Philips hue lights
-- Adalight (PC ambilight via serial)
+- Adalight (PC ambilight via serial) and TPM2
 - Sync color of multiple WLED devices (UDP notifier)
 - Infrared remotes (24-key RGB, receiver required)
 - Simple timers/schedules (time from NTP, timezones/DST supported)

diff --git a/wled00/data/index.htm b/wled00/data/index.htm
@@ -1131,7 +1131,7 @@
 const ranges = RangeTouch.setup('input[type="range"]', {});
 var lastinfo = {};
 var cfg = {
-	theme:{base:"dark", bg:{url:""}, alpha:{bg:0.6,tab:0.6}, color:{bg:""}},
+	theme:{base:"dark", bg:{url:""}, alpha:{bg:0.6,tab:0.8}, color:{bg:""}},
 	comp :{colors:{picker: true, rgb: false, quick: true, hex: false}, labels:true, pcmbot:false}
 };
 

diff --git a/wled00/html_other.h b/wled00/html_other.h
@@ -39,7 +39,7 @@ const char PAGE_update[] PROGMEM = R"=====(<!DOCTYPE html><html><head><meta cont
 <title>WLED Update</title><script>function B(){window.history.back()}</script>
 <style>
 .bt{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.3ch solid #333;display:inline-block;font-size:20px;margin:8px;margin-top:12px}input[type=file]{font-size:16px}body{font-family:Verdana,sans-serif;text-align:center;background:#222;color:#fff;line-height:200%}
-</style></head><body><h2>WLED Software Update</h2>Installed version: 0.10.1<br>
+</style></head><body><h2>WLED Software Update</h2>Installed version: 0.10.2<br>
 Download the latest binary: <a href="https://github.com/atuline/WLED/releases">
 <img 
 src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square">

diff --git a/wled00/html_settings.h b/wled00/html_settings.h
@@ -538,7 +538,7 @@ HTTP traffic is unencrypted. An attacker in the same network can intercept form
 <h3>Software Update</h3><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/atuline/WLED/" target="_blank">WLED</a>
- version 0.10.1<br><br><a 
+ version 0.10.2<br><br><a 
 href="https://github.com/atuline/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>

diff --git a/wled00/html_ui.h b/wled00/html_ui.h
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
@@ -392,8 +392,12 @@ void WLED::initInterfaces()
   strip.service();
   // Set up mDNS responder:
   if (strlen(cmDNS) > 0) {
-    if (!aOtaEnabled)
+  #ifndef WLED_DISABLE_OTA
+    if (!aOtaEnabled) //ArduinoOTA begins mDNS for us if enabled
       MDNS.begin(cmDNS);
+  #else
+    MDNS.begin(cmDNS);
+  #endif
 
     DEBUG_PRINTLN("mDNS started");
     MDNS.addService("http", "tcp", 80);

diff --git a/wled00/wled.h b/wled00/wled.h
@@ -3,12 +3,12 @@
 /*
    Main sketch, global variable declarations
    @title WLED project sketch
-   @version 0.10.2 (release candidate)
+   @version 0.10.2
    @author Christian Schwinne
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2008300
+#define VERSION 2009030
 
 // 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).
 
@@ -20,17 +20,19 @@
 //#define WLED_DISABLE_OTA         // saves 14kb
 
 // You need to choose some of these features to disable:
-#define WLED_DISABLE_ALEXA         // saves 11kb
-#define WLED_DISABLE_BLYNK         // saves 6kb
-#define WLED_DISABLE_CRONIXIE      // saves 3kb
-#define WLED_DISABLE_HUESYNC       // saves 4kb
-#define WLED_DISABLE_INFRARED      // there is no pin left for this on ESP8266-01, saves 12kb
+//#define WLED_DISABLE_ALEXA         // saves 11kb
+//#define WLED_DISABLE_BLYNK         // saves 6kb
+//#define WLED_DISABLE_CRONIXIE      // saves 3kb
+//#define WLED_DISABLE_HUESYNC       // saves 4kb
+//#define WLED_DISABLE_INFRARED      // there is no pin left for this on ESP8266-01, saves 12kb
 #ifndef WLED_DISABLE_MQTT
   #define WLED_ENABLE_MQTT         // saves 12kb
 #endif
 //#define WLED_ENABLE_ADALIGHT     // saves 500b only
 //#define WLED_ENABLE_DMX          // uses 3.5kb (use LEDPIN other than 2)
-//#define WLED_ENABLE_WEBSOCKETS
+#ifndef WLED_DISABLE_WEBSOCKETS
+  #define WLED_ENABLE_WEBSOCKETS
+#endif
 //#define WLED_DISABLE_SOUND       // saves 1kb
 
 #define WLED_DISABLE_FILESYSTEM    // SPIFFS is not used by any WLED feature yet