Skip to content

Commit 330da13

Browse files
committed
Fixed virtual getPixelColor() returning scaled values
1 parent 9e5d45d commit 330da13

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

wled00/bus_manager.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -408,12 +408,11 @@ class BusNetwork : public Bus {
408408
uint32_t getPixelColor(uint16_t pix) {
409409
if (!_valid || pix >= _len) return 0;
410410
uint16_t offset = pix * _UDPchannels;
411-
// behave as NeoPixelBus
412411
return (
413-
(_rgbw ? (scale8(_data[offset+3], _bri) << 24) : 0)
414-
| (scale8(_data[offset] , _bri) << 16)
415-
| (scale8(_data[offset+1], _bri) << 8)
416-
| (scale8(_data[offset+2], _bri) )
412+
(_rgbw ? (_data[offset+3] << 24) : 0)
413+
| (_data[offset] << 16)
414+
| (_data[offset+1] << 8)
415+
| (_data[offset+2] )
417416
);
418417
}
419418

@@ -549,7 +548,6 @@ class BusManager {
549548
uint16_t bstart = b->getStart();
550549
if (pix < bstart || pix >= bstart + b->getLength()) continue;
551550
busses[i]->setPixelColor(pix - bstart, c);
552-
break;
553551
}
554552
}
555553

wled00/data/settings_leds.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
<option value="5">GBR</option>
323323
</select></div>
324324
<br>
325-
<span id="psd${i}">Start:</span> <input type="number" name="LS${i}" id="ls${i}" class="l starts" min="0" max="8191" value="${lastEnd(i)}" oninput="UI();startsDirty[${i}]=true;" required />&nbsp;
325+
<span id="psd${i}">Start:</span> <input type="number" name="LS${i}" id="ls${i}" class="l starts" min="0" max="8191" value="${lastEnd(i)}" oninput="startsDirty[${i}]=true;UI();" required />&nbsp;
326326
<div id="dig${i}c" style="display:inline">Length: <input type="number" name="LC${i}" class="l" min="1" max="${maxPB}" value="1" required oninput="UI()" /></div>
327327
<br>
328328
<span id="p0d${i}">GPIO:</span> <input type="number" name="L0${i}" min="0" max="33" required class="xs" onchange="UI()"/>

0 commit comments

Comments
 (0)