jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-11-14 21:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge effectChanged and colorChanged to stateChanged

Browse Source
This commit is contained in:
cschwinne
2022-02-21 22:12:13 +01:00
parent 5f871bc01f
commit 44739c5198
6 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wled00/json.cpp
View File

@@ -135,17 +135,13 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId)
byte sz = colX.size();
if (sz == 0) continue; //do nothing on empty array
byte cp = copyArray(colX, rgbw, 4);
if (cp == 1 && rgbw[0] == 0)
seg.setColor(i, 0, id);
byte cp = copyArray(colX, rgbw, 4);
colValid = true;
}
if (!colValid) continue;
uint32_t color = RGBW32(rgbw[0],rgbw[1],rgbw[2],rgbw[3]);
colorChanged |= (seg.colors[i] != color);
seg.setColor(i, color, id);
seg.setColor(i, RGBW32(rgbw[0],rgbw[1],rgbw[2],rgbw[3]), id);
if (seg.mode == FX_MODE_STATIC) strip.trigger(); //instant refresh
}
}
@@ -231,7 +227,7 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId)
seg.setOption(SEG_OPTION_FREEZE, false);
}
//send UDP if not in preset and something changed that is not just selection
if (!presetId && (seg.differs(prev) & 0x7F)) effectChanged = true;
if (!presetId && (seg.differs(prev) & 0x7F)) stateChanged = true;
return;
}