Skip to content

Correct single RGB & DRGB modes to explicitly utilize white #3507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
+13 −9
Draft

Correct single RGB & DRGB modes to explicitly utilize white #3507

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
376a83f
Correct single RGB & DRGB modes to explicitly utilize white
mxklb Nov 8, 2023
29e6ccd
Fix compile error
mxklb Nov 8, 2023
84457b7
Fix compile error
mxklb Nov 8, 2023
1602c44
Removed faulty platformio.ini changes
mxklb Nov 8, 2023
ababf58
Added missing main segment check
mxklb Nov 17, 2023
a740d71
Added parentheses
mxklb Nov 17, 2023
bdd667d
Removed wrong length
mxklb Nov 17, 2023
3d9d658
Less loops if main segment only length < totalLen
mxklb Nov 18, 2023
e4dba3f
Merged latest changes from wled branch main
mxklb May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions wled00/e131.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ void handleE131Packet(e131_packet_t* p, IPAddress clientIP, byte protocol){

void handleDMXData(uint16_t uni, uint16_t dmxChannels, uint8_t* e131_data, uint8_t mde, uint8_t previousUniverses) {
byte wChannel = 0;
unsigned dmxChannelCount = 0;
unsigned totalLen = strip.getLengthTotal();
unsigned availDMXLen = 0;
unsigned dataOffset = DMXAddress;
Expand All @@ -144,35 +145,38 @@ void handleDMXData(uint16_t uni, uint16_t dmxChannels, uint8_t* e131_data, uint8
return; // nothing to do
break;

case DMX_MODE_SINGLE_RGB: // 3 channel: [R,G,B]
case DMX_MODE_SINGLE_RGB: // 3-4 channels: [R,G,B] + W (if present)
if (uni != e131Universe) return;
if (availDMXLen < 3) return;

realtimeLock(realtimeTimeoutMs, mde);

if (realtimeOverride && !(realtimeMode && useMainSegmentOnly)) return;

wChannel = (availDMXLen > 3) ? e131_data[dataOffset+3] : 0;
dmxChannelCount = (useMainSegmentOnly ? strip.getMainSegment().hasWhite() : strip.hasWhiteChannel()) ? 4 : 3;
if (availDMXLen < dmxChannelCount) return;

wChannel = dmxChannelCount == 4 ? e131_data[dataOffset+3] : 0;
if (useMainSegmentOnly) strip.getMainSegment().beginDraw();
for (unsigned i = 0; i < totalLen; i++)
for (unsigned i = 0; i < useMainSegmentOnly ? strip.getMainSegment().length() : totalLen; i++)
setRealtimePixel(i, e131_data[dataOffset+0], e131_data[dataOffset+1], e131_data[dataOffset+2], wChannel);
break;

case DMX_MODE_SINGLE_DRGB: // 4 channel: [Dimmer,R,G,B]
case DMX_MODE_SINGLE_DRGB: // 4-5 channels: [Dimmer,R,G,B] + W (if present)
if (uni != e131Universe) return;
if (availDMXLen < 4) return;

realtimeLock(realtimeTimeoutMs, mde);
if (realtimeOverride && !(realtimeMode && useMainSegmentOnly)) return;
wChannel = (availDMXLen > 4) ? e131_data[dataOffset+4] : 0;

dmxChannelCount = (useMainSegmentOnly ? strip.getMainSegment().hasWhite() : strip.hasWhiteChannel()) ? 5 : 4;
if (availDMXLen < dmxChannelCount) return;

if (bri != e131_data[dataOffset+0]) {
bri = e131_data[dataOffset+0];
strip.setBrightness(bri, true);
}

wChannel = dmxChannelCount == 5 ? e131_data[dataOffset+4] : 0;
if (useMainSegmentOnly) strip.getMainSegment().beginDraw();
for (unsigned i = 0; i < totalLen; i++)
for (unsigned i = 0; i < useMainSegmentOnly ? strip.getMainSegment().length() : totalLen; i++)
setRealtimePixel(i, e131_data[dataOffset+1], e131_data[dataOffset+2], e131_data[dataOffset+3], wChannel);
break;

Expand Down