Skip to content

Commit 023eab3

Browse files
committed
Set 2 values between each segment option
Due to the midi interface being difficult/impossible to increment on values of 1 because it has 7-bits of granularity, this commit moves all the bitfields for configuring segment options left by one which guarantees that every option has 2 values next to each other. This allows midi controllers to more easily select an individual segment option for 2D arrays.
1 parent 6e3a96b commit 023eab3

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

wled00/e131.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,11 @@ void handleE131Packet(e131_packet_t* p, IPAddress clientIP, byte protocol){
225225
if (e131_data[dataOffset+3] != seg.intensity) seg.intensity = e131_data[dataOffset+3];
226226
if (e131_data[dataOffset+4] != seg.palette) seg.setPalette(e131_data[dataOffset+4]);
227227

228-
if ((e131_data[dataOffset+5] & 0b00000001) != seg.reverse_y) { seg.setOption(SEG_OPTION_REVERSED_Y, e131_data[dataOffset+5] & 0b00000001); }
229-
if ((e131_data[dataOffset+5] & 0b00000010) != seg.mirror_y) { seg.setOption(SEG_OPTION_MIRROR_Y, e131_data[dataOffset+5] & 0b00000010); }
230-
if ((e131_data[dataOffset+5] & 0b00000100) != seg.transpose) { seg.setOption(SEG_OPTION_TRANSPOSED, e131_data[dataOffset+5] & 0b00000100); }
231-
if ((e131_data[dataOffset+5] & 0b00011000) / 8 != seg.map1D2D) {
232-
seg.map1D2D = (e131_data[dataOffset+5] & 0b00011000) / 8;
228+
if ((e131_data[dataOffset+5] & 0b00000010) != seg.reverse_y) { seg.setOption(SEG_OPTION_REVERSED_Y, e131_data[dataOffset+5] & 0b00000010); }
229+
if ((e131_data[dataOffset+5] & 0b00000100) != seg.mirror_y) { seg.setOption(SEG_OPTION_MIRROR_Y, e131_data[dataOffset+5] & 0b00000100); }
230+
if ((e131_data[dataOffset+5] & 0b00001000) != seg.transpose) { seg.setOption(SEG_OPTION_TRANSPOSED, e131_data[dataOffset+5] & 0b00001000); }
231+
if ((e131_data[dataOffset+5] & 0b00110000) / 8 != seg.map1D2D) {
232+
seg.map1D2D = (e131_data[dataOffset+5] & 0b00110000) / 8;
233233
}
234234
// To maintain backwards compatibility with prior e1.31 values, reverse is fixed to mask 0x01000000
235235
if ((e131_data[dataOffset+5] & 0b01000000) != seg.reverse) { seg.setOption(SEG_OPTION_REVERSED, e131_data[dataOffset+5] & 0b01000000); }

0 commit comments

Comments
 (0)