Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Nov 25, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac4198e
[mqtt.homeassistant] interpret a dimmable light as OFF properly from …
ccutrer Jul 17, 2023
37a2fd4
handle brightness but not color bulbs
ccutrer Nov 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions .../main/java/org/openhab/binding/mqtt/homeassistant/internal/component/JSONSchemaLight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,26 +253,38 @@ public void updateChannelState(ChannelUID channel, State state) {
}
}

boolean off = false;
if (jsonState.state != null) {
onOffValue.update(onOffValue.parseCommand(new StringType(jsonState.state)));
off = onOffValue.getChannelState().equals(OnOffType.OFF);
if (brightnessValue.getChannelState() instanceof UnDefType) {
brightnessValue.update(brightnessValue.parseCommand((OnOffType) onOffValue.getChannelState()));
brightnessValue.update(off ? PercentType.ZERO : PercentType.HUNDRED);
}
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) {
brightnessValue.update(
brightnessValue.parseCommand(new DecimalType(Objects.requireNonNull(jsonState.brightness))));
if (!off) {
brightness = (PercentType) brightnessValue
.parseMessage(new DecimalType(Objects.requireNonNull(jsonState.brightness)));
}
brightnessValue.update(brightness);
if (colorValue.getChannelState() instanceof HSBType) {
HSBType color = (HSBType) colorValue.getChannelState();
colorValue.update(new HSBType(color.getHue(), color.getSaturation(),
(PercentType) brightnessValue.getChannelState()));
colorValue.update(new HSBType(color.getHue(), color.getSaturation(), brightness));
} else {
colorValue.update(new HSBType(DecimalType.ZERO, PercentType.ZERO,
(PercentType) brightnessValue.getChannelState()));
colorValue.update(new HSBType(DecimalType.ZERO, PercentType.ZERO, brightness));
}
}

Expand All @@ -284,9 +296,6 @@ public void updateChannelState(ChannelUID channel, State state) {
}

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
// mode is currently active.
// HS is highest priority, then XY, then RGB
Expand Down
3 changes: 3 additions & 0 deletions .../java/org/openhab/binding/mqtt/homeassistant/internal/component/JSONSchemaLightTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ public void testBrightnessAndOnOff() throws InterruptedException {
assertState(component, Light.BRIGHTNESS_CHANNEL_ID,
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);
assertPublished("zigbee2mqtt/light/set/state", "{\"state\":\"ON\",\"brightness\":255}");

Expand Down