Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for #3403

Browse Source
This commit is contained in:
Blaz Kristan
2023-10-01 13:26:31 +02:00
committed by Frank
parent 7e21003f07
commit 3eb360dfe1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wled00/FX_fcn.cpp
View File

@@ -1976,7 +1976,7 @@ void WS2812FX::purgeSegments(bool force) {
} }
if (deleted) { if (deleted) {
_segments.shrink_to_fit(); _segments.shrink_to_fit();
if (_mainSegment >= _segments.size()) setMainSegmentId(0); /*if (_mainSegment >= _segments.size())*/ setMainSegmentId(0);
} }
} }

5
wled00/json.cpp
View File

@@ -82,6 +82,7 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
if (!elem["rev2D"].isNull()) elem["rY"] = elem["rev2D"]; if (!elem["rev2D"].isNull()) elem["rY"] = elem["rev2D"];
if (!elem["rot2D"].isNull()) elem["tp"] = elem["rot2D"]; if (!elem["rot2D"].isNull()) elem["tp"] = elem["rot2D"];
bool newSeg = false;
int stop = elem["stop"] | -1; int stop = elem["stop"] | -1;
// if using vectors use this code to append segment // if using vectors use this code to append segment
@@ -89,6 +90,7 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
if (stop <= 0) return false; // ignore empty/inactive segments if (stop <= 0) return false; // ignore empty/inactive segments
strip.appendSegment(Segment(0, strip.getLengthTotal())); strip.appendSegment(Segment(0, strip.getLengthTotal()));
id = strip.getSegmentsNum()-1; // segments are added at the end of list id = strip.getSegmentsNum()-1; // segments are added at the end of list
newSeg = true;
} }
// WLEDMM: before changing segments, make sure our strip is _not_ servicing effects in parallel // WLEDMM: before changing segments, make sure our strip is _not_ servicing effects in parallel
@@ -188,9 +190,12 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
} }
if (stop > start && of > len -1) of = len -1; if (stop > start && of > len -1) of = len -1;
seg.setUp(start, stop, grp, spc, of, startY, stopY); seg.setUp(start, stop, grp, spc, of, startY, stopY);
if (newSeg) seg.refreshLightCapabilities(); // fix for #3403
if (seg.reset && seg.stop == 0) { if (seg.reset && seg.stop == 0) {
if (iAmGroot) suspendStripService = false; // WLEDMM release lock if (iAmGroot) suspendStripService = false; // WLEDMM release lock
if (id == strip.getMainSegmentId()) strip.setMainSegmentId(0); // fix for #3403
return true; // segment was deleted & is marked for reset, no need to change anything else return true; // segment was deleted & is marked for reset, no need to change anything else
} }