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

Rename local ledCount

Browse Source
This commit is contained in:
cschwinne 2020-08-03 12:27:16 +02:00
parent 3a4f4c8c34
commit 7730a00dbb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wled00/e131.cpp
View File

@ -109,8 +109,8 @@ void handleE131Packet(e131_packet_t* p, IPAddress clientIP, bool isArtnet){
colSec[2] = e131_data[DMXAddress+10]; colSec[2] = e131_data[DMXAddress+10];
if (dmxChannels-DMXAddress+1 > 11) if (dmxChannels-DMXAddress+1 > 11)
{ {
col[3] = e131_data[DMXAddress+11]; //white col[3] = e131_data[DMXAddress+11]; //white
colSec[3] = e131_data[DMXAddress+12]; colSec[3] = e131_data[DMXAddress+12];
} }
transitionDelayTemp = 0; // act fast transitionDelayTemp = 0; // act fast
colorUpdated(NOTIFIER_CALL_MODE_NOTIFICATION); // don't send UDP colorUpdated(NOTIFIER_CALL_MODE_NOTIFICATION); // don't send UDP
@ -122,23 +122,23 @@ void handleE131Packet(e131_packet_t* p, IPAddress clientIP, bool isArtnet){
{ {
realtimeLock(realtimeTimeoutMs, mde); realtimeLock(realtimeTimeoutMs, mde);
if (realtimeOverride) return; if (realtimeOverride) return;
uint16_t previousLEDs, dmxOffset; uint16_t previousLeds, dmxOffset;
if (previousUniverses == 0) { if (previousUniverses == 0) {
if (dmxChannels-DMXAddress < 1) return; if (dmxChannels-DMXAddress < 1) return;
dmxOffset = DMXAddress; dmxOffset = DMXAddress;
previousLEDs = 0; previousLeds = 0;
// First DMX address is dimmer in DMX_MODE_MULTIPLE_DRGB mode. // First DMX address is dimmer in DMX_MODE_MULTIPLE_DRGB mode.
if (DMXMode == DMX_MODE_MULTIPLE_DRGB) { if (DMXMode == DMX_MODE_MULTIPLE_DRGB) {
strip.setBrightness( e131_data[dmxOffset++]); strip.setBrightness(e131_data[dmxOffset++]);
} }
} else { } else {
// All subsequent universes start at the first channel. // All subsequent universes start at the first channel.
dmxOffset = isArtnet ? 0 : 1; dmxOffset = isArtnet ? 0 : 1;
uint16_t possibleLEDsFirstUniverse = (MAX_CHANNELS_PER_UNIVERSE - DMXAddress) / 3; uint16_t ledsInFirstUniverse = (MAX_CHANNELS_PER_UNIVERSE - DMXAddress) / 3;
previousLEDs = possibleLEDsFirstUniverse + (previousUniverses - 1) * MAX_LEDS_PER_UNIVERSE; previousLeds = ledsInFirstUniverse + (previousUniverses - 1) * MAX_LEDS_PER_UNIVERSE;
} }
uint16_t ledCount = previousLEDs + (dmxChannels - dmxOffset) / 3; uint16_t ledsTotal = previousLeds + (dmxChannels - dmxOffset) / 3;
for (uint16_t i = previousLEDs; i < ledCount; i++) { for (uint16_t i = previousLeds; i < ledsTotal; i++) {
setRealtimePixel(i, e131_data[dmxOffset++], e131_data[dmxOffset++], e131_data[dmxOffset++], 0); setRealtimePixel(i, e131_data[dmxOffset++], e131_data[dmxOffset++], e131_data[dmxOffset++], 0);
} }
break; break;