From: J-N-K <github@klug.nrw>
Date: Fri, 17 May 2024 19:41:38 +0000 (+0200)
Subject: [deconz] Fix color conversion (#16769)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=7715bd2b538df5f61f4102adcc00a7ae0a33d21d;p=openhab-addons.git

[deconz] Fix color conversion (#16769)

After core changes to ColorUtil the Y part can no longer be used as brightness.

Signed-off-by: Jan N. Klug <github@klug.nrw>
---

diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java
index ae7114de54..9c408369fc 100644
--- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java
+++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java
@@ -217,12 +217,12 @@ public class LightThingHandler extends DeconzBaseThingHandler {
                     } else {
                         double[] xy = ColorUtil.hsbToXY(hsbCommand);
                         newLightState.xy = new double[] { xy[0], xy[1] };
-                        newLightState.bri = (int) (xy[2] * BRIGHTNESS_MAX);
+                        newLightState.bri = Util.fromPercentType(hsbCommand.getBrightness());
                     }
-                } else if (command instanceof PercentType) {
-                    newLightState.bri = Util.fromPercentType((PercentType) command);
-                } else if (command instanceof DecimalType) {
-                    newLightState.bri = ((DecimalType) command).intValue();
+                } else if (command instanceof PercentType percentCommand) {
+                    newLightState.bri = Util.fromPercentType(percentCommand);
+                } else if (command instanceof DecimalType decimalCommand) {
+                    newLightState.bri = decimalCommand.intValue();
                 } else {
                     return;
                 }