Most 0.6.0 features working

LEDs now turn on instantly after boot
Support Hardware ESP32 RMT NeopixelBus library
Added setting to force old LED boot behavior (init after WiFi)
Fixed overlay switching bug
Fixed ? characters in usused macros
Added transitionDelay to notifier packet
This commit is contained in:
cschwinne 2018-03-15 12:04:14 +01:00
parent 8d7a066680
commit 89afdd2b17
14 changed files with 96 additions and 56 deletions

View File

@ -3,22 +3,25 @@
WLED is a fast and (relatively) secure implementation of an ESP8266 webserver to control NeoPixel (WS2812B) LEDs! WLED is a fast and (relatively) secure implementation of an ESP8266 webserver to control NeoPixel (WS2812B) LEDs!
Now also with experimental ESP32 support. Now also with experimental ESP32 support.
### Features: (V0.5.0) ### Features: (V0.6.0)
- RGB, HSB, and brightness sliders - RGB, HSB, and brightness sliders
- Settings page - configuration over network - Settings page - configuration over network
- Access Point and station mode - automatic failsafe AP - Access Point and station mode - automatic failsafe AP
- WS2812FX library integrated for over 50 special effects! - WS2812FX library integrated for over 50 special effects!
- Secondary color support lets you use even more effect combinations - Secondary color support lets you use even more effect combinations
- Alexa smart home device server (including dimming)
- Beta syncronization to Philips hue lights
- Support for RGBW strips - Support for RGBW strips
- 25 user presets! Save your favorite colors and effects and apply them easily! - 25 user presets! Save your favorite colors and effects and apply them easily!
- HTTP request API for simple integration
- Macro functions to automatically execute API calls
- Nightlight function (gradually dims down) - Nightlight function (gradually dims down)
- Notifier function (multiple ESPs sync color via UDP broadcast) - Notifier function (multiple ESPs sync color via UDP broadcast)
- Support for power pushbutton - Support for power pushbutton
- Custom Theater Chase - Custom Theater Chase
- Full OTA software update capability (HTTP and ArduinoOTA) - Full OTA software update capability (HTTP and ArduinoOTA)
- Password protected OTA page for added security (OTA lock) - Password protected OTA page for added security (OTA lock)
- Alexa smart home device server (including dimming) - NTP and configurable analog clock function
- NTP and experimental analog clock function
- Support for the Cronixie Clock kit by Diamex - Support for the Cronixie Clock kit by Diamex
- Realtime UDP Packet Control (WARLS) possible - Realtime UDP Packet Control (WARLS) possible
- Client HTML UI controlled, customizable themes - Client HTML UI controlled, customizable themes

View File

@ -2040,12 +2040,17 @@ void WS2812FX::setBrightness(byte b)
void WS2812FX::show() void WS2812FX::show()
{ {
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#ifdef WORKAROUND_ESP32_BITBANG
delay(1); delay(1);
portDISABLE_INTERRUPTS(); //this is a workaround to prevent flickering (see https://github.com/adafruit/Adafruit_NeoPixel/issues/139) portDISABLE_INTERRUPTS(); //this is a workaround to prevent flickering (see https://github.com/adafruit/Adafruit_NeoPixel/issues/139)
#endif
#endif
NeoPixelBrightnessBus::Show(); NeoPixelBrightnessBus::Show();
#ifdef ARDUINO_ARCH_ESP32
#ifdef WORKAROUND_ESP32_BITBANG
portENABLE_INTERRUPTS(); portENABLE_INTERRUPTS();
#else #endif
NeoPixelBrightnessBus::Show();
#endif #endif
} }

View File

@ -1,10 +1,16 @@
//#define RGBW //#define RGBW
#define PIN 2 //strip pin. Only change for ESP32 #define PIN 2 //strip pin. Only change for ESP32
#define WORKAROUND_ESP32_BITBANG
//see https://github.com/Aircoookie/WLED/issues/2 for flicker free ESP32 support
//automatically uses the right driver method for each platform //automatically uses the right driver method for each platform
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#ifdef WORKAROUND_ESP32_BITBANG
#define PIXELMETHOD NeoEsp32BitBangWs2813Method #define PIXELMETHOD NeoEsp32BitBangWs2813Method
#else #else
#define PIXELMETHOD NeoEsp32RmtWS2813_V3Method
#endif
#else
#define PIXELMETHOD NeoEsp8266Uart800KbpsMethod #define PIXELMETHOD NeoEsp8266Uart800KbpsMethod
#endif #endif

Binary file not shown.

View File

@ -117,6 +117,7 @@ Default Target brightness: <input name="TB" type="number" min="0" max="255" requ
Fade down: <input type="checkbox" name="TW"><br> Fade down: <input type="checkbox" name="TW"><br>
<h3>Advanced</h3> <h3>Advanced</h3>
Reverse LED order (rotate 180): <input type="checkbox" name="RV"><br> Reverse LED order (rotate 180): <input type="checkbox" name="RV"><br>
Init LEDs after WiFi: <input type="checkbox" name="EI"><br>
WARLS offset: <input name="WO" type="number" min="-255" max="255" required><hr> WARLS offset: <input name="WO" type="number" min="-255" max="255" required><hr>
<button type="button" onclick="B()">Back</button><button type="submit">Save</button> <button type="button" onclick="B()">Back</button><button type="submit">Save</button>
</form> </form>

View File

@ -33,7 +33,7 @@
#include "WS2812FX.h" #include "WS2812FX.h"
//version in format yymmddb (b = daily build) //version in format yymmddb (b = daily build)
#define VERSION 1803144 #define VERSION 1803146
const String versionString = "0.6.0"; const String versionString = "0.6.0";
//AP and OTA default passwords (change them!) //AP and OTA default passwords (change them!)
@ -74,6 +74,7 @@ IPAddress staticSubnet(255, 255, 255, 0);
IPAddress staticDNS(8, 8, 8, 8); //only for NTP IPAddress staticDNS(8, 8, 8, 8); //only for NTP
bool useHSB = false, useHSBDefault = false; bool useHSB = false, useHSBDefault = false;
bool turnOnAtBoot = true; bool turnOnAtBoot = true;
bool initLedsLast = false;
byte bootPreset = 0; byte bootPreset = 0;
byte colS[]{255, 159, 0}; byte colS[]{255, 159, 0};
byte colSecS[]{0, 0, 0}; byte colSecS[]{0, 0, 0};
@ -99,8 +100,7 @@ byte effectSpeedDefault = 75;
byte effectIntensityDefault = 128; byte effectIntensityDefault = 128;
//NTP stuff //NTP stuff
bool ntpEnabled = false; bool ntpEnabled = false;
IPAddress ntpServerIP; String ntpServerName = "0.wled.pool.ntp.org";
const char* ntpServerName = "0.wled.pool.ntp.org";
//custom chase //custom chase
byte ccNumPrimary = 2; byte ccNumPrimary = 2;
byte ccNumSecondary = 4; byte ccNumSecondary = 4;
@ -123,20 +123,13 @@ unsigned long countdownTime = 1514764800L;
double transitionResolution = 0.011; double transitionResolution = 0.011;
//hue //hue
long hueLastRequestSent = 0;
bool huePollingEnabled = false, hueAttempt = false; bool huePollingEnabled = false, hueAttempt = false;
uint16_t huePollIntervalMs = 2500; uint16_t huePollIntervalMs = 2500;
uint32_t huePollIntervalMsTemp = 2500;
String hueApiKey = "api"; String hueApiKey = "api";
byte huePollLightId = 1; byte huePollLightId = 1;
IPAddress hueIP = (0,0,0,0); IPAddress hueIP = (0,0,0,0);
bool notifyHue = true; bool notifyHue = true;
bool hueApplyOnOff = true, hueApplyBri = true, hueApplyColor = true; bool hueApplyOnOff = true, hueApplyBri = true, hueApplyColor = true;
String hueError = "Inactive";
uint16_t hueFailCount = 0;
float hueXLast=0, hueYLast=0;
uint16_t hueHueLast=0, hueCtLast=0;
byte hueSatLast=0, hueBriLast=0;
//Internal vars //Internal vars
byte col[]{0, 0, 0}; byte col[]{0, 0, 0};
@ -176,15 +169,19 @@ String cssFont="Verdana";
String cssColorString=""; String cssColorString="";
//NTP stuff //NTP stuff
bool ntpConnected = false; bool ntpConnected = false;
unsigned int ntpLocalPort = 2390;
const uint16_t NTP_PACKET_SIZE = 48;
byte ntpPacketBuffer[NTP_PACKET_SIZE];
unsigned long ntpLastSyncTime = 999000000L;
unsigned long ntpPacketSentTime = 999000000L;
byte currentTimezone = 0; byte currentTimezone = 0;
time_t local; time_t local;
int utcOffsetSecs = 0; int utcOffsetSecs = 0;
//hue
String hueError = "Inactive";
uint16_t hueFailCount = 0;
float hueXLast=0, hueYLast=0;
uint16_t hueHueLast=0, hueCtLast=0;
byte hueSatLast=0, hueBriLast=0;
long hueLastRequestSent = 0;
uint32_t huePollIntervalMsTemp = huePollIntervalMs;
//overlay stuff //overlay stuff
byte overlayDefault = 0; byte overlayDefault = 0;
byte overlayCurrent = 0; byte overlayCurrent = 0;
@ -242,6 +239,12 @@ HTTPClient hueClient;
ESP8266HTTPUpdateServer httpUpdater; ESP8266HTTPUpdateServer httpUpdater;
WiFiUDP notifierUdp; WiFiUDP notifierUdp;
WiFiUDP ntpUdp; WiFiUDP ntpUdp;
IPAddress ntpServerIP;
unsigned int ntpLocalPort = 2390;
const uint16_t NTP_PACKET_SIZE = 48;
byte ntpPacketBuffer[NTP_PACKET_SIZE];
unsigned long ntpLastSyncTime = 999000000L;
unsigned long ntpPacketSentTime = 999000000L;
WS2812FX strip = WS2812FX(LEDCOUNT); WS2812FX strip = WS2812FX(LEDCOUNT);

View File

@ -6,13 +6,14 @@
#define EEPSIZE 3072 #define EEPSIZE 3072
//eeprom Version code, enables default settings instead of 0 init on update //eeprom Version code, enables default settings instead of 0 init on update
#define EEPVER 5 #define EEPVER 6
//0 -> old version, default //0 -> old version, default
//1 -> 0.4p 1711272 and up //1 -> 0.4p 1711272 and up
//2 -> 0.4p 1711302 and up //2 -> 0.4p 1711302 and up
//3 -> 0.4 1712121 and up //3 -> 0.4 1712121 and up
//4 -> 0.5.0 and up //4 -> 0.5.0 and up
//5 -> 0.6.0 and up //5 -> 0.5.1 and up
//6 -> 0.6.0 and up
//todo add settings //todo add settings
void clearEEPROM() void clearEEPROM()
@ -145,6 +146,7 @@ void saveSettingsToEEPROM()
EEPROM.write(394, (abs(utcOffsetSecs) >> 0) & 0xFF); EEPROM.write(394, (abs(utcOffsetSecs) >> 0) & 0xFF);
EEPROM.write(395, (abs(utcOffsetSecs) >> 8) & 0xFF); EEPROM.write(395, (abs(utcOffsetSecs) >> 8) & 0xFF);
EEPROM.write(396, (utcOffsetSecs<0)); //is negative EEPROM.write(396, (utcOffsetSecs<0)); //is negative
EEPROM.write(397, initLedsLast);
for (int k=0;k<6;k++){ for (int k=0;k<6;k++){
int in = 900+k*8; int in = 900+k*8;
@ -380,6 +382,8 @@ void loadSettingsFromEEPROM(bool first)
hueApplyBri = EEPROM.read(2104); hueApplyBri = EEPROM.read(2104);
hueApplyColor = EEPROM.read(2105); hueApplyColor = EEPROM.read(2105);
huePollLightId = EEPROM.read(2106); huePollLightId = EEPROM.read(2106);
}
if (lastEEPROMversion > 5) {
overlayMin = EEPROM.read(2150); overlayMin = EEPROM.read(2150);
overlayMax = EEPROM.read(2151); overlayMax = EEPROM.read(2151);
analogClock12pixel = EEPROM.read(2152); analogClock12pixel = EEPROM.read(2152);
@ -415,6 +419,7 @@ void loadSettingsFromEEPROM(bool first)
wifiLock = EEPROM.read(393); wifiLock = EEPROM.read(393);
utcOffsetSecs = ((EEPROM.read(394) << 0) & 0xFF) + ((EEPROM.read(395) << 8) & 0xFF00); utcOffsetSecs = ((EEPROM.read(394) << 0) & 0xFF) + ((EEPROM.read(395) << 8) & 0xFF00);
if (EEPROM.read(396)) utcOffsetSecs = -utcOffsetSecs; //negative if (EEPROM.read(396)) utcOffsetSecs = -utcOffsetSecs; //negative
initLedsLast = EEPROM.read(397);
//favorite setting memory (25 slots/ each 20byte) //favorite setting memory (25 slots/ each 20byte)
//400 - 899 reserved //400 - 899 reserved
@ -519,6 +524,7 @@ String loadMacro(byte index)
if (EEPROM.read(i) == 0) break; if (EEPROM.read(i) == 0) break;
m += char(EEPROM.read(i)); m += char(EEPROM.read(i));
} }
if (m.charAt(0) < 65 || m.charAt(0) > 90) return ""; //do simple check if macro is valid (capital first letter)
return m; return m;
} }

View File

@ -166,6 +166,7 @@ String getSettings(byte subPage)
resp += ds + "TL" + v + nightlightDelayMins +";"; resp += ds + "TL" + v + nightlightDelayMins +";";
resp += ds + "TW" + c + nightlightFade +";"; resp += ds + "TW" + c + nightlightFade +";";
resp += ds + "RV" + c + reverseMode +";"; resp += ds + "RV" + c + reverseMode +";";
resp += ds + "EI" + c + initLedsLast +";";
resp += ds + "WO" + v + arlsOffset +";"; resp += ds + "WO" + v + arlsOffset +";";
} }

View File

@ -231,6 +231,7 @@ void handleSettingsSet(byte subPage)
} }
nightlightFade = server.hasArg("TW"); nightlightFade = server.hasArg("TW");
reverseMode = server.hasArg("RV"); reverseMode = server.hasArg("RV");
initLedsLast = server.hasArg("EI");
strip.setReverseMode(reverseMode); strip.setReverseMode(reverseMode);
if (server.hasArg("WO")) if (server.hasArg("WO"))
{ {

View File

@ -4,27 +4,19 @@
void wledInit() void wledInit()
{ {
EEPROM.begin(EEPSIZE);
if (!EEPROM.read(397)) strip.init(); //quick init
Serial.begin(115200); Serial.begin(115200);
#ifdef USEFS #ifdef USEFS
SPIFFS.begin(); SPIFFS.begin();
{
Dir dir = SPIFFS.openDir("/");
while (dir.next()) {
String fileName = dir.fileName();
size_t fileSize = dir.fileSize();
#ifdef DEBUG
Serial.printf("FS File: %s, size: %s\n", fileName.c_str(), formatBytes(fileSize).c_str());
#endif
}
DEBUG_PRINTF("\n");
}
#endif #endif
DEBUG_PRINTLN("Init EEPROM"); DEBUG_PRINTLN("Load EEPROM");
EEPROM.begin(EEPSIZE);
loadSettingsFromEEPROM(true); loadSettingsFromEEPROM(true);
DEBUG_PRINT("CC: SSID: "); if (!initLedsLast) initStrip();
DEBUG_PRINT("C-SSID: ");
DEBUG_PRINT(clientSSID); DEBUG_PRINT(clientSSID);
buildCssColorString(); buildCssColorString();
userBeginPreConnection(); userBeginPreConnection();
@ -140,7 +132,7 @@ void wledInit()
}); });
server.on("/reset", HTTP_GET, [](){ server.on("/reset", HTTP_GET, [](){
serveMessage(200,"Rebooting now...","(takes ~20 seconds, wait for auto-redirect)",139); serveMessage(200,"Rebooting now...","(takes ~20 seconds, wait for auto-redirect)",79);
reset(); reset();
}); });
@ -301,10 +293,15 @@ void wledInit()
ArduinoOTA.begin(); ArduinoOTA.begin();
} }
if (initLedsLast) initStrip();
userBegin(); userBegin();
if (macroBoot>0) applyMacro(macroBoot);
}
// Initialize NeoPixel Strip void initStrip()
strip.init(); {
// Initialize NeoPixel Strip and button
if (initLedsLast) strip.init();
strip.setLedCount(ledCount); strip.setLedCount(ledCount);
strip.setReverseMode(reverseMode); strip.setReverseMode(reverseMode);
strip.setColor(0); strip.setColor(0);
@ -314,7 +311,6 @@ void wledInit()
pinMode(buttonPin, INPUT_PULLUP); pinMode(buttonPin, INPUT_PULLUP);
if (bootPreset>0) applyPreset(bootPreset, turnOnAtBoot, true, true); if (bootPreset>0) applyPreset(bootPreset, turnOnAtBoot, true, true);
if (macroBoot>0) applyMacro(macroBoot);
colorUpdated(0); colorUpdated(0);
if(digitalRead(buttonPin) == LOW) buttonEnabled = false; //disable button if it is "pressed" unintentionally if(digitalRead(buttonPin) == LOW) buttonEnabled = false; //disable button if it is "pressed" unintentionally
} }
@ -331,17 +327,32 @@ void initCon()
int fail_count = 0; int fail_count = 0;
if (clientSSID.length() <1 || clientSSID.equals("Your_Network")) fail_count = apWaitTimeSecs*2; if (clientSSID.length() <1 || clientSSID.equals("Your_Network")) fail_count = apWaitTimeSecs*2;
WiFi.begin(clientSSID.c_str(), clientPass.c_str()); WiFi.begin(clientSSID.c_str(), clientPass.c_str());
while(WiFi.status() != WL_CONNECTED) { unsigned long lastTry = 0;
delay(500); bool con = false;
DEBUG_PRINTLN("C_NC"); while(!con)
fail_count++; {
if (!recoveryAPDisabled && fail_count > apWaitTimeSecs*2) yield();
if (!initLedsLast)
{ {
WiFi.disconnect(); handleTransitions();
DEBUG_PRINTLN("Can't connect. Opening AP..."); handleButton();
onlyAP = true; handleOverlays();
initAP(); if (briT) strip.service();
return; }
if (millis()-lastTry > 499) {
con = (WiFi.status() == WL_CONNECTED);
if (con) DEBUG_PRINTLN("rofl");
lastTry = millis();
DEBUG_PRINTLN("C_NC");
if (!recoveryAPDisabled && fail_count > apWaitTimeSecs*2)
{
WiFi.disconnect();
DEBUG_PRINTLN("Can't connect. Opening AP...");
onlyAP = true;
initAP();
return;
}
fail_count++;
} }
} }
} }

View File

@ -28,12 +28,14 @@ void notify(byte callMode, bool followUp=false)
udpOut[8] = effectCurrent; udpOut[8] = effectCurrent;
udpOut[9] = effectSpeed; udpOut[9] = effectSpeed;
udpOut[10] = white; udpOut[10] = white;
udpOut[11] = 3; //compatibilityVersionByte: 0: old 1: supports white 2: supports secondary color 3: supports FX intensity, 24 byte packet udpOut[11] = 4; //compatibilityVersionByte: 0: old 1: supports white 2: supports secondary color 3: supports FX intensity, 24 byte packet 4: supports transitionDelay
udpOut[12] = colSec[0]; udpOut[12] = colSec[0];
udpOut[13] = colSec[1]; udpOut[13] = colSec[1];
udpOut[14] = colSec[2]; udpOut[14] = colSec[2];
udpOut[15] = whiteSec; udpOut[15] = whiteSec;
udpOut[16] = effectIntensity; udpOut[16] = effectIntensity;
udpOut[17] = (transitionDelay >> 0) & 0xFF;
udpOut[18] = (transitionDelay >> 8) & 0xFF;
IPAddress broadcastIp; IPAddress broadcastIp;
broadcastIp = ~WiFi.subnetMask() | WiFi.gatewayIP(); broadcastIp = ~WiFi.subnetMask() | WiFi.gatewayIP();

View File

@ -69,7 +69,8 @@ void handleNetworkTime()
void sendNTPPacket() void sendNTPPacket()
{ {
WiFi.hostByName(ntpServerName, ntpServerIP); const char* ntpsrv = ntpServerName.c_str();
WiFi.hostByName(ntpsrv, ntpServerIP);
DEBUG_PRINTLN("send NTP packet"); DEBUG_PRINTLN("send NTP packet");
memset(ntpPacketBuffer, 0, NTP_PACKET_SIZE); memset(ntpPacketBuffer, 0, NTP_PACKET_SIZE);

View File

@ -118,19 +118,19 @@ void _nixieNumber(int number, int dur)
void handleOverlays() void handleOverlays()
{ {
if (overlayCurrent == 0) return;
if (millis() - overlayRefreshedTime > overlayRefreshMs) if (millis() - overlayRefreshedTime > overlayRefreshMs)
{ {
initCronixie(); initCronixie();
updateLocalTime(); updateLocalTime();
switch (overlayCurrent) switch (overlayCurrent)
{ {
case 0: break;//no overlay
case 1: _overlaySolid(); break;//solid secondary color case 1: _overlaySolid(); break;//solid secondary color
case 2: _overlayAnalogClock(); break;//2 analog clock case 2: _overlayAnalogClock(); break;//2 analog clock
case 3: _overlayNixieClock(); break;//nixie 1-digit case 3: _overlayNixieClock(); break;//nixie 1-digit
case 4: _overlayCronixie();//Diamex cronixie clock kit case 4: _overlayCronixie();//Diamex cronixie clock kit
} }
if (!countdownMode || overlayCurrent < 2) checkCountdown(); //countdown macro activation must work
overlayRefreshedTime = millis(); overlayRefreshedTime = millis();
} }
} }

View File

@ -64,7 +64,7 @@ bool sendHuePoll(bool sAuth)
st = false; st = false;
} }
if (!st){ //error if (!st){ //error
if (hueFailCount<7) huePollIntervalMsTemp*=2; // only poll every 5min when unable to connect if (huePollIntervalMsTemp<300000) huePollIntervalMsTemp*=2; // only poll every ~5min when unable to connect
hueFailCount++; hueFailCount++;
if (hueFailCount > 150) huePollingEnabled = false; //disable after many hours offline if (hueFailCount > 150) huePollingEnabled = false; //disable after many hours offline
} }