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

Fixing conflict merge errors.

Browse Source
This commit is contained in:
Blaz Kristan 2021-10-26 06:29:49 +02:00
parent 94cf6424f5
commit cde497c94e
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wled00/cfg.cpp
View File

@ -109,7 +109,6 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
} }
uint16_t length = elm[F("len")] | 1; uint16_t length = elm[F("len")] | 1;
if (length==0 || length+lC > MAX_LEDS) continue; // zero length or we reached max. number of LEDs, just stop
uint8_t colorOrder = (int)elm[F("order")]; uint8_t colorOrder = (int)elm[F("order")];
uint8_t skipFirst = elm[F("skip")]; uint8_t skipFirst = elm[F("skip")];
uint16_t start = elm["start"] | 0; uint16_t start = elm["start"] | 0;

21
wled00/json.cpp
View File

@ -166,16 +166,16 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId)
strip.fill(0); strip.fill(0);
} }
//uint16_t start = 0, stop = 0; uint16_t start = 0, stop = 0;
byte set = 0; //0 nothing set, 1 start set, 2 range set byte set = 0; //0 nothing set, 1 start set, 2 range set
for (uint16_t i = 0; i < iarr.size(); i++) { for (uint16_t i = 0; i < iarr.size(); i++) {
if(iarr[i].is<JsonInteger>()) { if(iarr[i].is<JsonInteger>()) {
if (!set) { if (!set) {
//start = iarr[i]; start = iarr[i];
set = 1; set = 1;
} else { } else {
//stop = iarr[i]; stop = iarr[i];
set = 2; set = 2;
} }
} else { //color } else { //color
@ -191,6 +191,13 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId)
for (uint8_t c = 0; c < 4; c++) rgbw[c] = brgbw[c]; for (uint8_t c = 0; c < 4; c++) rgbw[c] = brgbw[c];
} }
} }
if (set < 2) stop = start + 1;
for (uint16_t i = start; i < stop; i++) {
strip.setPixelColor(i, rgbw[0], rgbw[1], rgbw[2], rgbw[3]);
}
if (!set) start++;
set = 0;
} }
} }
strip.setPixelSegment(255); strip.setPixelSegment(255);
@ -225,6 +232,14 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
transitionDelayTemp = transitionDelay; transitionDelayTemp = transitionDelay;
} }
} }
tr = root[F("tt")] | -1;
if (tr >= 0)
{
transitionDelayTemp = tr;
transitionDelayTemp *= 100;
jsonTransitionOnce = true;
}
strip.setTransition(transitionDelayTemp); strip.setTransition(transitionDelayTemp);
tr = root[F("tb")] | -1; tr = root[F("tb")] | -1;