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

Transition bugfix.

Browse Source
This commit is contained in:
Blaz Kristan 2023-06-04 18:36:46 +02:00
parent 92390d1d59
commit 1e7071bff3
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wled00/FX_fcn.cpp
View File

@ -184,7 +184,7 @@ void Segment::deallocateData() {
void Segment::resetIfRequired() { void Segment::resetIfRequired() {
if (reset) { if (reset) {
if (leds && !Segment::_globalLeds) { free(leds); leds = nullptr; } if (leds && !Segment::_globalLeds) { free(leds); leds = nullptr; }
if (transitional && _t) { transitional = false; delete _t; _t = nullptr; } //if (transitional && _t) { transitional = false; delete _t; _t = nullptr; }
deallocateData(); deallocateData();
next_time = 0; step = 0; call = 0; aux0 = 0; aux1 = 0; next_time = 0; step = 0; call = 0; aux0 = 0; aux1 = 0;
reset = false; // setOption(SEG_OPTION_RESET, false); reset = false; // setOption(SEG_OPTION_RESET, false);
@ -367,16 +367,15 @@ CRGBPalette16 &Segment::currentPalette(CRGBPalette16 &targetPalette, uint8_t pal
void Segment::handleTransition() { void Segment::handleTransition() {
if (!transitional) return; if (!transitional) return;
unsigned long maxWait = millis() + 20; uint16_t _progress = progress();
if (mode == FX_MODE_STATIC && next_time > maxWait) next_time = maxWait; if (_t) { // thanks to @nXm AKA https://github.com/NMeirer
if (progress() == 0xFFFFU) { if (_progress >= 32767U && _t->_modeP != mode) markForReset();
if (_t) { if (_progress == 0xFFFFU) {
if (_t->_modeP != mode) markForReset();
delete _t; delete _t;
_t = nullptr; _t = nullptr;
} }
transitional = false; // finish transitioning segment
} }
if (_progress == 0xFFFFU) transitional = false; // finish transitioning segment
} }
void Segment::setUp(uint16_t i1, uint16_t i2, uint8_t grp, uint8_t spc, uint16_t ofs, uint16_t i1Y, uint16_t i2Y) { void Segment::setUp(uint16_t i1, uint16_t i2, uint8_t grp, uint8_t spc, uint16_t ofs, uint16_t i1Y, uint16_t i2Y) {
@ -1095,6 +1094,8 @@ void WS2812FX::service() {
_isServicing = true; _isServicing = true;
_segment_index = 0; _segment_index = 0;
for (segment &seg : _segments) { for (segment &seg : _segments) {
// process transition (mode changes in the middle of transition)
seg.handleTransition();
// reset the segment runtime data if needed // reset the segment runtime data if needed
seg.resetIfRequired(); seg.resetIfRequired();
@ -1123,8 +1124,6 @@ void WS2812FX::service() {
delay = (*_mode[seg.currentMode(seg.mode)])(); delay = (*_mode[seg.currentMode(seg.mode)])();
if (seg.mode != FX_MODE_HALLOWEEN_EYES) seg.call++; if (seg.mode != FX_MODE_HALLOWEEN_EYES) seg.call++;
if (seg.transitional && delay > FRAMETIME) delay = FRAMETIME; // force faster updates during transition if (seg.transitional && delay > FRAMETIME) delay = FRAMETIME; // force faster updates during transition
seg.handleTransition();
} }
seg.next_time = nowUp + delay; seg.next_time = nowUp + delay;