diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/component/JSONSchemaLight.java b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/component/JSONSchemaLight.java index 93dcd606a..a86f6488d 100644 --- a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/component/JSONSchemaLight.java +++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/component/JSONSchemaLight.java @@ -253,26 +253,38 @@ public class JSONSchemaLight extends AbstractRawSchemaLight { } } + 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)); } } @@ -284,9 +296,6 @@ public class JSONSchemaLight extends AbstractRawSchemaLight { } 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 diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/component/JSONSchemaLightTests.java b/bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/component/JSONSchemaLightTests.java index e1c50de28..604836dfc 100644 --- a/bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/component/JSONSchemaLightTests.java +++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/component/JSONSchemaLightTests.java @@ -119,6 +119,9 @@ public class JSONSchemaLightTests extends AbstractComponentTests { 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}");