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

replace potentially infinite wait with 2100ms max

Browse Source 
better to end with an inconsistent state, than risk a lock-up until reset
This commit is contained in:
Frank
2025-12-22 00:05:54 +01:00
parent 30fcd6efad
commit 73c54d7a57
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wled00/FX_fcn.cpp
View File

@@ -562,7 +562,7 @@ void Segment::setUp(uint16_t i1, uint16_t i2, uint8_t grp, uint8_t spc, uint16_t
return;
}
if (esp32SemTake(segmentMux, portMAX_DELAY) == pdTRUE) {
if (esp32SemTake(segmentMux, 2100) == pdTRUE) { // wait long, but don't wait forever
// WLEDMM acquire lock before doing critical changes to segment
if (i1 < Segment::maxWidth || (i1 >= Segment::maxWidth*Segment::maxHeight && i1 < strip.getLengthTotal())) start = i1; // Segment::maxWidth equals strip.getLengthTotal() for 1D
stop = i2 > Segment::maxWidth*Segment::maxHeight ? min(i2,strip.getLengthTotal()) : (i2 > Segment::maxWidth ? Segment::maxWidth : max((uint16_t)1,i2)); // WLEDMM: use native min/max
@@ -2400,7 +2400,7 @@ void WS2812FX::resetSegments(bool boundsOnly) { //WLEDMM add boundsonly
DEBUG_PRINTF("resetSegments %d %dx%d\n", boundsOnly, Segment::maxWidth, Segment::maxHeight);
if (!boundsOnly) {
// WLEDMM protect against parallel access while drawing
if (esp32SemTake(segmentMux, portMAX_DELAY) != pdTRUE) return; // warning: this waits until the mutex becomes availeable, no timeout
if (esp32SemTake(segmentMux, 2100) != pdTRUE) return; // wait long, but don't wait forever
_segments.clear(); // destructs all Segment as part of clearing
#ifndef WLED_DISABLE_2D
@@ -2430,7 +2430,7 @@ void WS2812FX::resetSegments(bool boundsOnly) { //WLEDMM add boundsonly
void WS2812FX::makeAutoSegments(bool forceReset) {
if (autoSegments) { //make one segment per bus
// WLEDMM protect against parallel access while drawing
if (esp32SemTake(segmentMux, portMAX_DELAY) != pdTRUE) return; // warning: this waits until the mutex becomes availeable, no timeout
if (esp32SemTake(segmentMux, 2100) != pdTRUE) return; // warning: this waits until the mutex becomes availeable, no timeout
uint16_t segStarts[MAX_NUM_SEGMENTS] = {0};
uint16_t segStops [MAX_NUM_SEGMENTS] = {0};
@@ -2507,7 +2507,7 @@ void WS2812FX::makeAutoSegments(bool forceReset) {
void WS2812FX::fixInvalidSegments() {
// WLEDMM protect against parallel access while drawing
if (esp32SemTake(segmentMux, portMAX_DELAY) != pdTRUE) return; // warning: this waits until the mutex becomes availeable, no timeout
if (esp32SemTake(segmentMux, 2100) != pdTRUE) return; // wait long, but don't wait forever
//make sure no segment is longer than total (sanity check)
for (size_t i = getSegmentsNum()-1; i > 0; i--) {

2
wled00/json.cpp
View File

@@ -94,7 +94,7 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
// if using vectors use this code to append segment
if (id >= strip.getSegmentsNum()) {
if (stop <= 0) return false; // ignore empty/inactive segments
if (esp32SemTake(segmentMux, portMAX_DELAY) == pdTRUE) {
if (esp32SemTake(segmentMux, 2100) == pdTRUE) { // wait long, but don't wait forever
// WLEDMM make sure we have exclusive access to the segment list
strip.appendSegment(Segment(0, strip.getLengthTotal()));
esp32SemGive(segmentMux);