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

Merge pull request #3134 from strikeout/DMX_MODE_PRESET_FIX

Browse Source 
Fixes DMX_MODE_PRESET preset and brightness selection via DMX controller
This commit is contained in:
Blaž Kristan 2023-04-26 19:30:14 +02:00 committed by GitHub
commit 4f8610f895
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wled00/e131.cpp
View File

@ -173,14 +173,30 @@ void handleE131Packet(e131_packet_t* p, IPAddress clientIP, byte protocol){
break; break;
case DMX_MODE_PRESET: // 2 channel: [Dimmer,Preset] case DMX_MODE_PRESET: // 2 channel: [Dimmer,Preset]
{
if (uni != e131Universe || availDMXLen < 2) return; if (uni != e131Universe || availDMXLen < 2) return;
applyPreset(e131_data[dataOffset+1], CALL_MODE_NOTIFICATION);
// limit max. selectable preset to 250, even though DMX max. val is 255
uint8_t dmxValPreset = (e131_data[dataOffset+1] > 250 ? 250 : e131_data[dataOffset+1]);
// only apply preset if value changed
if (dmxValPreset != 0 && dmxValPreset != currentPreset &&
// only apply preset if not in playlist, or playlist changed
(currentPlaylist < 0 || dmxValPreset != currentPlaylist)) {
presetCycCurr = dmxValPreset;
unloadPlaylist(); // applying a preset unloads the playlist
applyPreset(dmxValPreset, CALL_MODE_NOTIFICATION);
}
// only change brightness if value changed
if (bri != e131_data[dataOffset]) { if (bri != e131_data[dataOffset]) {
bri = e131_data[dataOffset]; bri = e131_data[dataOffset];
strip.setBrightness(bri, true); strip.setBrightness(scaledBri(bri), false);
stateUpdated(CALL_MODE_WS_SEND);
} }
return; return;
break; break;
}
case DMX_MODE_EFFECT: // 15 channels [bri,effectCurrent,effectSpeed,effectIntensity,effectPalette,effectOption,R,G,B,R2,G2,B2,R3,G3,B3] case DMX_MODE_EFFECT: // 15 channels [bri,effectCurrent,effectSpeed,effectIntensity,effectPalette,effectOption,R,G,B,R2,G2,B2,R3,G3,B3]
case DMX_MODE_EFFECT_W: // 18 channels, same as above but with extra +3 white channels [..,W,W2,W3] case DMX_MODE_EFFECT_W: // 18 channels, same as above but with extra +3 white channels [..,W,W2,W3]