Fixed ESP32 version

Fixed Adalight serial Ambilight
This commit is contained in:
cschwinne 2018-10-04 22:38:39 +02:00
parent c2972786f5
commit 43e9743645
3 changed files with 12 additions and 12 deletions

View File

@ -45,7 +45,7 @@
//version code in format yymmddb (b = daily build) //version code in format yymmddb (b = daily build)
#define VERSION 1810031 #define VERSION 1810041
char versionString[] = "0.8.0"; char versionString[] = "0.8.0";
@ -54,14 +54,14 @@ char apPass[65] = "wled1234";
char otaPass[33] = "wledota"; char otaPass[33] = "wledota";
//to toggle usb serial debug (un)comment following line(s)
//#define DEBUG
//spiffs FS only useful for debug (only ESP8266) //spiffs FS only useful for debug (only ESP8266)
//#define USEFS //#define USEFS
//to toggle usb serial debug (un)comment following line(s)
#define DEBUG
//Hardware CONFIG (only changeble HERE, not at runtime) //Hardware CONFIG (only changeble HERE, not at runtime)
//LED strip pin changeable in NpbWrapper.h. Only change for ESP32 //LED strip pin changeable in NpbWrapper.h. Only change for ESP32
byte buttonPin = 0; //needs pull-up byte buttonPin = 0; //needs pull-up

View File

@ -7,11 +7,7 @@ void handleSerial()
{ {
if (Serial.find("Ada")) if (Serial.find("Ada"))
{ {
if (!realtimeActive){ if (!realtimeActive && bri == 0) strip.setBrightness(briLast);
if (bri == 0) strip.setBrightness(briLast);
strip.setRange(0, ledCount-1, 0);
strip.setMode(0);
}
arlsLock(realtimeTimeoutMs); arlsLock(realtimeTimeoutMs);
delay(1); delay(1);
byte hi = Serial.read(); byte hi = Serial.read();

View File

@ -57,7 +57,11 @@ void wledInit()
} }
prepareIds(); //UUID from MAC (for Alexa and MQTT) prepareIds(); //UUID from MAC (for Alexa and MQTT)
if (mqttDeviceTopic[0] == 0) strcpy(mqttDeviceTopic, strcat("wled/", escapedMac.c_str())); if (mqttDeviceTopic[0] == 0)
{
strcpy(mqttDeviceTopic, "wled/");
strcat(mqttDeviceTopic, escapedMac.c_str());
}
//smartInit, we only init some resources when connected //smartInit, we only init some resources when connected
if (!onlyAP && WiFi.status() == WL_CONNECTED) if (!onlyAP && WiFi.status() == WL_CONNECTED)