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

bugfix: prevent _segment_index being misaligned w.r.t. segments vector

Browse Source 
prevent that an inactive segment in the segments list causes misalignment between getSegmentID() and actual segments vector.
This commit is contained in:
Frank
2026-03-24 15:21:31 +01:00
parent 75e1ade22f
commit 50f507fa56
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wled00/FX_fcn.cpp
View File

@@ -1937,9 +1937,10 @@ void WS2812FX::service() {
unsigned speedLimit = (_targetFps != FPS_UNLIMITED) && (_targetFps != FPS_UNLIMITED_AC) ? (0.85f * FRAMETIME) : 1; // WLEDMM minimum for effect frametime unsigned speedLimit = (_targetFps != FPS_UNLIMITED) && (_targetFps != FPS_UNLIMITED_AC) ? (0.85f * FRAMETIME) : 1; // WLEDMM minimum for effect frametime
_isServicing = true; _isServicing = true;
_segment_index = 0;
if (esp32SemTake(segmentMux, 250) == pdTRUE) { // WLEDMM prevent changes to segments while servicing if (esp32SemTake(segmentMux, 250) == pdTRUE) { // WLEDMM prevent changes to segments while servicing
for (segment &seg : _segments) { for (size_t i = 0; i < _segments.size(); i++) {
Segment &seg = _segments[i];
_segment_index = i;
#ifdef WLEDMM_FASTPATH #ifdef WLEDMM_FASTPATH
_currentSeg = &seg; _currentSeg = &seg;
#endif #endif
@@ -1990,10 +1991,11 @@ void WS2812FX::service() {
seg.next_time = nowUp + frameDelay; seg.next_time = nowUp + frameDelay;
} }
_segment_index++;
} }
esp32SemGive(segmentMux); esp32SemGive(segmentMux);
} // end of critical section } // end of critical section
_segment_index = 0; // segment index is only valid while effects are serviced
#ifdef WLEDMM_FASTPATH #ifdef WLEDMM_FASTPATH
_currentSeg = & strip.getMainSegment(); // WLEDMM safe default _currentSeg = & strip.getMainSegment(); // WLEDMM safe default