Merge branch 'master' into websockets

This commit is contained in:
cschwinne 2020-06-29 22:00:21 +02:00
commit 409303d0f5
4 changed files with 20 additions and 2 deletions

View File

@ -2,6 +2,14 @@
### Development versions after 0.10.0 release ### Development versions after 0.10.0 release
#### Build 2006251
- Added `SV=2` to HTTP API, allow selecting single segment only
#### Build 2006250
- Fix Alexa not turning off white channel (fixes #1012)
#### Build 2006220 #### Build 2006220
- Added Sunrise nightlight mode - Added Sunrise nightlight mode

View File

@ -85,6 +85,7 @@ void onAlexaChange(EspalexaDevice* dev)
col[0] = ((color >> 16) & 0xFF); col[0] = ((color >> 16) & 0xFF);
col[1] = ((color >> 8) & 0xFF); col[1] = ((color >> 8) & 0xFF);
col[2] = ( color & 0xFF); col[2] = ( color & 0xFF);
col[3] = 0;
} }
colorUpdated(NOTIFIER_CALL_MODE_ALEXA); colorUpdated(NOTIFIER_CALL_MODE_ALEXA);
} }

View File

@ -423,7 +423,16 @@ bool handleSet(AsyncWebServerRequest *request, const String& req)
WS2812FX::Segment& mainseg = strip.getSegment(main); WS2812FX::Segment& mainseg = strip.getSegment(main);
pos = req.indexOf("SV="); //segment selected pos = req.indexOf("SV="); //segment selected
if (pos > 0) mainseg.setOption(SEG_OPTION_SELECTED, (req.charAt(pos+3) != '0')); if (pos > 0) {
byte t = getNumVal(&req, pos);
if (t == 2) {
for (uint8_t i = 0; i < strip.getMaxSegments(); i++)
{
strip.getSegment(i).setOption(SEG_OPTION_SELECTED, 0);
}
}
mainseg.setOption(SEG_OPTION_SELECTED, t);
}
uint16_t startI = mainseg.start; uint16_t startI = mainseg.start;
uint16_t stopI = mainseg.stop; uint16_t stopI = mainseg.stop;

View File

@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2006260 #define VERSION 2006290
// 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). // 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).