public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[mqtt.homeassistant] interpret a dimmable light as OFF properly from zigbee2mqtt (#15925) 

* [mqtt.homeassistant] interpret a dimmable light as OFF properly from zigbee2mqtt

zigbee2mqtt can send a brightness of say 99, with a state of OFF, when a bulb is
off. make sure if state is sent, it overrides all other inferences

* handle brightness but not color bulbs

---------

Signed-off-by: Cody Cutrer <cody@cutrer.us>
This commit is contained in:
Cody Cutrer 2023-11-25 04:47:00 -07:00 committed by GitHub
parent c7aed14a49
commit 9d214b0558
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/component/JSONSchemaLight.java
View File

@ -253,26 +253,38 @@ public class JSONSchemaLight extends AbstractRawSchemaLight {
} }
} }
boolean off = false;
if (jsonState.state != null) { if (jsonState.state != null) {
onOffValue.update(onOffValue.parseCommand(new StringType(jsonState.state))); onOffValue.update(onOffValue.parseCommand(new StringType(jsonState.state)));
off = onOffValue.getChannelState().equals(OnOffType.OFF);
if (brightnessValue.getChannelState() instanceof UnDefType) { if (brightnessValue.getChannelState() instanceof UnDefType) {
brightnessValue.update(brightnessValue.parseCommand((OnOffType) onOffValue.getChannelState())); brightnessValue.update(off ? PercentType.ZERO : PercentType.HUNDRED);
} }
if (colorValue.getChannelState() instanceof UnDefType) { if (colorValue.getChannelState() instanceof UnDefType) {
colorValue.update(colorValue.parseCommand((OnOffType) onOffValue.getChannelState())); colorValue.update(off ? HSBType.BLACK : HSBType.WHITE);
} }
} }
PercentType brightness;
if (off) {
brightness = PercentType.ZERO;
} else if (brightnessValue.getChannelState() instanceof PercentType percentValue) {
brightness = percentValue;
} else {
brightness = PercentType.HUNDRED;
}
if (jsonState.brightness != null) { if (jsonState.brightness != null) {
brightnessValue.update( if (!off) {
brightnessValue.parseCommand(new DecimalType(Objects.requireNonNull(jsonState.brightness)))); brightness = (PercentType) brightnessValue
.parseMessage(new DecimalType(Objects.requireNonNull(jsonState.brightness)));
}
brightnessValue.update(brightness);
if (colorValue.getChannelState() instanceof HSBType) { if (colorValue.getChannelState() instanceof HSBType) {
HSBType color = (HSBType) colorValue.getChannelState(); HSBType color = (HSBType) colorValue.getChannelState();
colorValue.update(new HSBType(color.getHue(), color.getSaturation(), colorValue.update(new HSBType(color.getHue(), color.getSaturation(), brightness));
(PercentType) brightnessValue.getChannelState()));
} else { } else {
colorValue.update(new HSBType(DecimalType.ZERO, PercentType.ZERO, colorValue.update(new HSBType(DecimalType.ZERO, PercentType.ZERO, brightness));
(PercentType) brightnessValue.getChannelState()));
} }
} }
@ -284,9 +296,6 @@ public class JSONSchemaLight extends AbstractRawSchemaLight {
} }
if (jsonState.color != null) { if (jsonState.color != null) {
PercentType brightness = brightnessValue.getChannelState() instanceof PercentType
? (PercentType) brightnessValue.getChannelState()
: PercentType.HUNDRED;
// This corresponds to "deprecated" color mode handling, since we're not checking which color // This corresponds to "deprecated" color mode handling, since we're not checking which color
// mode is currently active. // mode is currently active.
// HS is highest priority, then XY, then RGB // HS is highest priority, then XY, then RGB

3
bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/component/JSONSchemaLightTests.java
View File

@ -119,6 +119,9 @@ public class JSONSchemaLightTests extends AbstractComponentTests {
assertState(component, Light.BRIGHTNESS_CHANNEL_ID, assertState(component, Light.BRIGHTNESS_CHANNEL_ID,
new PercentType(new BigDecimal(128 * 100).divide(new BigDecimal(255), MathContext.DECIMAL128))); new PercentType(new BigDecimal(128 * 100).divide(new BigDecimal(255), MathContext.DECIMAL128)));
publishMessage("zigbee2mqtt/light/state", "{ \"state\": \"OFF\", \"brightness\": 128 }");
assertState(component, Light.BRIGHTNESS_CHANNEL_ID, PercentType.ZERO);
sendCommand(component, Light.BRIGHTNESS_CHANNEL_ID, PercentType.HUNDRED); sendCommand(component, Light.BRIGHTNESS_CHANNEL_ID, PercentType.HUNDRED);
assertPublished("zigbee2mqtt/light/set/state", "{\"state\":\"ON\",\"brightness\":255}"); assertPublished("zigbee2mqtt/light/set/state", "{\"state\":\"ON\",\"brightness\":255}");