lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 2.4.0

Browse Source
This commit is contained in:
cschwinne 2019-10-25 15:32:09 +02:00
parent 937f404583
commit 0cd46f932a
3 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wled00/wled00.ino
View File

@ -30,21 +30,21 @@
//#define WLED_ENABLE_FS_EDITOR //enable /edit page for editing SPIFFS content. Will also be disabled with OTA lock //#define WLED_ENABLE_FS_EDITOR //enable /edit page for editing SPIFFS content. Will also be disabled with OTA lock
//to toggle usb serial debug (un)comment the following line //to toggle usb serial debug (un)comment the following line
//#define WLED_DEBUG #define WLED_DEBUG
//library inclusions //library inclusions
#include <Arduino.h> #include <Arduino.h>
#ifdef ARDUINO_ARCH_ESP32 #ifdef ESP8266
#include <ESP8266WiFi.h>
#include <ESP8266mDNS.h>
#include <ESPAsyncTCP.h>
#else
#include <WiFi.h> #include <WiFi.h>
#include "esp_wifi.h" #include "esp_wifi.h"
#include <ESPmDNS.h> #include <ESPmDNS.h>
#include <AsyncTCP.h> #include <AsyncTCP.h>
#include "SPIFFS.h" #include "SPIFFS.h"
#else
#include <ESP8266WiFi.h>
#include <ESP8266mDNS.h>
#include <ESPAsyncTCP.h>
#endif #endif
#include <ESPAsyncWebServer.h> #include <ESPAsyncWebServer.h>
@ -100,7 +100,7 @@
//version code in format yymmddb (b = daily build) //version code in format yymmddb (b = daily build)
#define VERSION 1910252 #define VERSION 1910253
char versionString[] = "0.8.6"; char versionString[] = "0.8.6";
@ -162,7 +162,7 @@ byte briMultiplier = 100; //% of brightness to set (to limit
//User Interface CONFIG //User Interface CONFIG
char serverDescription[33] = "WLED"; //Name of module char serverDescription[33] = "WLED"; //Name of module
byte currentTheme = 7; //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 byte uiConfiguration = 2; //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 bool useHSB = true; //classic UI: use HSB sliders instead of RGB by default
char cssFont[33] = "Verdana"; //font to use in classic UI char cssFont[33] = "Verdana"; //font to use in classic UI

21
wled00/wled05_init.ino
View File

@ -205,27 +205,18 @@ void initInterfaces() {
if (alexaEnabled) alexaInit(); if (alexaEnabled) alexaInit();
#ifndef WLED_DISABLE_OTA #ifndef WLED_DISABLE_OTA
#ifdef ESP8266 if (aOtaEnabled) ArduinoOTA.begin();
if (aOtaEnabled) ArduinoOTA.begin(false);
#else
ArduinoOTA.setMdnsEnabled(false);
if (aOtaEnabled) ArduinoOTA.begin();
#endif
#endif #endif
strip.service(); strip.service();
// Set up mDNS responder: // Set up mDNS responder:
if (strlen(cmDNS) > 0) if (strlen(cmDNS) > 0)
{ {
if (MDNS.begin(cmDNS)) if (!aOtaEnabled) MDNS.begin(cmDNS);
{
DEBUG_PRINTLN("mDNS started"); DEBUG_PRINTLN("mDNS started");
MDNS.addService("http", "tcp", 80); MDNS.addService("http", "tcp", 80);
MDNS.addService("wled", "tcp", 80); MDNS.addService("wled", "tcp", 80);
if (aOtaEnabled) MDNS.enableArduino(8266);
} else {
DEBUG_PRINTLN("mDNS failed!");
}
} }
server.begin(); server.begin();

5
wled00/wled17_mqtt.ino
View File

@ -106,7 +106,7 @@ void sendHADiscoveryMQTT()
#if ARDUINO_ARCH_ESP32 || LEDPIN != 3 #if ARDUINO_ARCH_ESP32 || LEDPIN != 3
/* /*
YYYY is discovery tipic YYYY is device topic
XXXX is device name XXXX is device name
Send out HA MQTT Discovery message on MQTT connect (~2.4kB): Send out HA MQTT Discovery message on MQTT connect (~2.4kB):
@ -212,7 +212,8 @@ Send out HA MQTT Discovery message on MQTT connect (~2.4kB):
strcpy(pubt, "homeassistant/light/"); strcpy(pubt, "homeassistant/light/");
strcat(pubt, mqttClientID); strcat(pubt, mqttClientID);
strcat(pubt, "/config"); strcat(pubt, "/config");
DEBUG_PRINTLN(mqtt->publish(pubt, 0, true, buffer)); bool success = mqtt->publish(pubt, 0, true, buffer);
DEBUG_PRINTLN(success);
#endif #endif
} }