jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-18 16:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent styles on 1px segments

Browse Source
This commit is contained in:
Blaz Kristan 2024-09-03 17:20:16 +02:00
parent 0430dc5a1f
commit ebd8a10cef
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wled00/FX_fcn.cpp
View File

@ -1428,6 +1428,8 @@ void WS2812FX::service() {
unsigned h = seg.virtualHeight(); unsigned h = seg.virtualHeight();
unsigned dw = p * w / 0xFFFFU + 1; unsigned dw = p * w / 0xFFFFU + 1;
unsigned dh = p * h / 0xFFFFU + 1; unsigned dh = p * h / 0xFFFFU + 1;
unsigned orgBS = blendingStyle;
if (w*h == 1) blendingStyle = BLEND_STYLE_FADE; // disable belending for single pixel segments (use fade instead)
switch (blendingStyle) { switch (blendingStyle) {
case BLEND_STYLE_FAIRY_DUST: // fairy dust (must set entire segment, see isPixelXYClipped()) case BLEND_STYLE_FAIRY_DUST: // fairy dust (must set entire segment, see isPixelXYClipped())
Segment::setClippingRect(0, w, 0, h); Segment::setClippingRect(0, w, 0, h);
@ -1473,9 +1475,8 @@ void WS2812FX::service() {
Segment::setClippingRect(0, dw, h - dh, h); Segment::setClippingRect(0, dw, h - dh, h);
break; break;
} }
} delay = (*_mode[seg.currentMode()])(); // run new/current mode
delay = (*_mode[seg.currentMode()])(); // run new/current mode // now run old/previous mode
if (seg.isInTransition()) {
Segment::tmpsegd_t _tmpSegData; Segment::tmpsegd_t _tmpSegData;
Segment::modeBlend(true); // set semaphore Segment::modeBlend(true); // set semaphore
seg.swapSegenv(_tmpSegData); // temporarily store new mode state (and swap it with transitional state) seg.swapSegenv(_tmpSegData); // temporarily store new mode state (and swap it with transitional state)
@ -1491,10 +1492,10 @@ void WS2812FX::service() {
seg.restoreSegenv(_tmpSegData); // restore mode state (will also update transitional state) seg.restoreSegenv(_tmpSegData); // restore mode state (will also update transitional state)
delay = MIN(delay,d2); // use shortest delay delay = MIN(delay,d2); // use shortest delay
Segment::modeBlend(false); // unset semaphore Segment::modeBlend(false); // unset semaphore
} blendingStyle = orgBS; // restore blending style if it was modified for single pixel segment
#else } else
delay = (*_mode[seg.mode])(); // run effect mode
#endif #endif
delay = (*_mode[seg.mode])(); // run effect mode (not in transition)
seg.call++; seg.call++;
if (seg.isInTransition() && delay > FRAMETIME) delay = FRAMETIME; // force faster updates during transition if (seg.isInTransition() && delay > FRAMETIME) delay = FRAMETIME; // force faster updates during transition
BusManager::setSegmentCCT(oldCCT); // restore old CCT for ABL adjustments BusManager::setSegmentCCT(oldCCT); // restore old CCT for ABL adjustments