demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix level write mode for LEDs which don't support white and color update at once. (#15846)

Browse Source 
Signed-off-by: Madeorsk <madeorsk@protonmail.com>
Signed-off-by: Ciprian Pascu <contact@ciprianpascu.ro>
This commit is contained in:
Madeorsk 2024-09-14 21:26:51 +02:00 committed by Ciprian Pascu
parent 9ee1db8e77
commit 01c0a2f8df
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/handler/AbstractWiFiLEDDriver.java
View File

@ -46,6 +46,18 @@ public abstract class AbstractWiFiLEDDriver {
FADING
}
public enum LevelWriteMode {
ALL((byte) 0x00),
COLORS((byte) 0xF0),
WHITES((byte) 0x0F);
public final byte byteValue;
private LevelWriteMode(byte byteValue) {
this.byteValue = byteValue;
}
}
public static final Integer DEFAULT_PORT = 5577;
protected static final int DEFAULT_SOCKET_TIMEOUT = 5000;
@ -199,11 +211,15 @@ public abstract class AbstractWiFiLEDDriver {
}
protected byte[] getBytesForColor(byte r, byte g, byte b, byte w, byte w2) {
return getBytesForColor(r, g, b, w, w2, LevelWriteMode.ALL);
}
protected byte[] getBytesForColor(byte r, byte g, byte b, byte w, byte w2, LevelWriteMode writeMode) {
byte[] bytes;
if (protocol == Protocol.LD382 || protocol == Protocol.LD382A) {
bytes = new byte[] { 0x31, r, g, b, w, 0x00 };
bytes = new byte[] { 0x31, r, g, b, w, writeMode.byteValue };
} else if (protocol == Protocol.LD686) {
bytes = new byte[] { 0x31, r, g, b, w, w2, 0x00 };
bytes = new byte[] { 0x31, r, g, b, w, w2, writeMode.byteValue };
} else {
throw new UnsupportedOperationException("Protocol " + protocol + " not yet implemented");
}

20
bundles/org.openhab.binding.wifiled/src/main/java/org/openhab/binding/wifiled/internal/handler/ClassicWiFiLEDDriver.java
View File

@ -70,7 +70,7 @@ public class ClassicWiFiLEDDriver extends AbstractWiFiLEDDriver {
logger.debug("Setting color to {}", color);
LEDStateDTO ledState = getLEDStateDTO().withColor(color).withoutProgram();
sendLEDData(ledState);
sendLEDData(ledState, LevelWriteMode.COLORS);
}
@Override
@ -78,7 +78,7 @@ public class ClassicWiFiLEDDriver extends AbstractWiFiLEDDriver {
logger.debug("Setting brightness to {}", brightness);
LEDStateDTO ledState = getLEDStateDTO().withBrightness(brightness).withoutProgram();
sendLEDData(ledState);
sendLEDData(ledState, LevelWriteMode.COLORS);
}
@Override
@ -86,7 +86,7 @@ public class ClassicWiFiLEDDriver extends AbstractWiFiLEDDriver {
logger.debug("Changing brightness by {}", step);
LEDStateDTO ledState = getLEDStateDTO().withIncrementedBrightness(step).withoutProgram();
sendLEDData(ledState);
sendLEDData(ledState, LevelWriteMode.COLORS);
}
@Override
@ -94,7 +94,7 @@ public class ClassicWiFiLEDDriver extends AbstractWiFiLEDDriver {
logger.debug("Setting (warm) white LED to {}", white);
LEDStateDTO ledState = getLEDStateDTO().withWhite(white).withoutProgram();
sendLEDData(ledState);
sendLEDData(ledState, LevelWriteMode.WHITES);
}
@Override
@ -102,7 +102,7 @@ public class ClassicWiFiLEDDriver extends AbstractWiFiLEDDriver {
logger.debug("Changing white by {}", step);
LEDStateDTO ledState = getLEDStateDTO().withIncrementedWhite(step).withoutProgram();
sendLEDData(ledState);
sendLEDData(ledState, LevelWriteMode.WHITES);
}
@Override
@ -110,7 +110,7 @@ public class ClassicWiFiLEDDriver extends AbstractWiFiLEDDriver {
logger.debug("Setting (warm) white 2 LED to {}", white2);
LEDStateDTO ledState = getLEDStateDTO().withWhite2(white2).withoutProgram();
sendLEDData(ledState);
sendLEDData(ledState, LevelWriteMode.WHITES);
}
@Override
@ -118,7 +118,7 @@ public class ClassicWiFiLEDDriver extends AbstractWiFiLEDDriver {
logger.debug("Changing white by {}", step);
LEDStateDTO ledState = getLEDStateDTO().withIncrementedWhite2(step).withoutProgram();
sendLEDData(ledState);
sendLEDData(ledState, LevelWriteMode.WHITES);
}
@Override
@ -156,6 +156,10 @@ public class ClassicWiFiLEDDriver extends AbstractWiFiLEDDriver {
}
private synchronized void sendLEDData(final LEDStateDTO ledState) {
this.sendLEDData(ledState, LevelWriteMode.ALL);
}
private synchronized void sendLEDData(final LEDStateDTO ledState, LevelWriteMode writeMode) {
cachedLedStatus = ledState;
if (!ledUpdateFuture.isDone()) {
ledUpdateFuture.cancel(true);
@ -171,7 +175,7 @@ public class ClassicWiFiLEDDriver extends AbstractWiFiLEDDriver {
byte w = (byte) (((int) (ledState.getWhite().doubleValue() * 255 / 100)) & 0xFF);
byte w2 = (byte) (((int) (ledState.getWhite2().doubleValue() * 255 / 100)) & 0xFF);
bytes = getBytesForColor(r, g, b, w, w2);
bytes = getBytesForColor(r, g, b, w, w2, writeMode);
} else {
// program selected
byte p = (byte) (program & 0xFF);