Power channel of a bulb is defined as QuantityType in xml, therefor i…

…t should create the state using QuantityType Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
openhab · Feb 3, 2022 · 01e27d5 · 01e27d5
1 parent 74151f1
commit 01e27d5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/bundles/org.openhab.binding.tplinksmarthome/README.md b/bundles/org.openhab.binding.tplinksmarthome/README.md
@@ -250,8 +250,7 @@ Switching, Brightness and Color is done using the `color` channel.
 * Adjust the brightness
 * Wi-Fi signal strength (RSSI)
 
-
-### KL400 Kasa Smart LED Light Strip, 16 Color Zones
+### KL430 Kasa Smart LED Light Strip, 16 Color Zones
 
 * Power On/Off
 * Fine-tune colors
@@ -382,9 +381,9 @@ All devices support some of the following channels:
 |---------------------|--------------------------|------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------|
 | switch              | Switch                   | Power the device on or off.                    | EP10, EP40, HS100, HS103, HS105, HS107, HS110, HS200, HS210, HS300, KP100, KP105, KP115, KP200, KP303, KP400, KS230, RE270K, RE370K             |
 | brightness          | Dimmer                   | Set the brightness of device or dimmer.        | ES20M, HS220, KB100, KL50, KL60, KL110, KL120, KP405, LB100, LB110, LB120, LB200                                                                |
-| colorTemperature    | Dimmer                   | Set the color temperature in percentage.       | KB130, KL120, KL125, KL130, KL135, KL400, KL430, LB120, LB130, LB230                                                                                   |
-| colorTemperatureAbs | Number                   | Set the color temperature in Kelvin.           | KB130, KL120, KL125, KL130, KL135, KL400, KL430, LB120, LB130, LB230                                                                                   |
-| color               | Color                    | Set the color of the light.                    | KB130, KL125, KL130, KL135, KL400, KL430, LB130, LB230                                                                                                 |
+| colorTemperature    | Dimmer                   | Set the color temperature in percentage.       | KB130, KL120, KL125, KL130, KL135, KL400, KL430, LB120, LB130, LB230                                                                            |
+| colorTemperatureAbs | Number                   | Set the color temperature in Kelvin.           | KB130, KL120, KL125, KL130, KL135, KL400, KL430, LB120, LB130, LB230                                                                            |
+| color               | Color                    | Set the color of the light.                    | KB130, KL125, KL130, KL135, KL400, KL430, LB130, LB230                                                                                          |
 | power               | Number:Power             | Actual energy usage in Watt.                   | HS110, HS300, KLxxx, KP115, KP125, LBxxx,                                                                                                       |
 | eneryUsage          | Number:Energy            | Energy Usage in kWh.                           | HS110, HS300, KP115, KP125                                                                                                                      |
 | current             | Number:ElectricCurrent   | Actual current usage in Ampere.                | HS110, HS300, KP115, KP125                                                                                                                      |

diff --git a/...arthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/device/BulbDevice.java b/...arthome/src/main/java/org/openhab/binding/tplinksmarthome/internal/device/BulbDevice.java
@@ -32,6 +32,8 @@
 import org.openhab.core.library.types.HSBType;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.unit.Units;
 import org.openhab.core.thing.ChannelUID;
 import org.openhab.core.types.Command;
 import org.openhab.core.types.State;
@@ -141,7 +143,7 @@ public State updateChannel(final ChannelUID channelUid, final DeviceState device
                 state = lightState.getOnOff();
                 break;
             case CHANNEL_ENERGY_POWER:
-                state = new DecimalType(deviceState.getRealtime().getPower());
+                state = new QuantityType<>(deviceState.getRealtime().getPower(), Units.WATT);
                 break;
             default:
                 state = UnDefType.UNDEF;

diff --git a/...ome/src/test/java/org/openhab/binding/tplinksmarthome/internal/device/BulbDeviceTest.java b/...ome/src/test/java/org/openhab/binding/tplinksmarthome/internal/device/BulbDeviceTest.java
@@ -34,6 +34,8 @@
 import org.openhab.core.library.types.HSBType;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.unit.Units;
 import org.openhab.core.types.UnDefType;
 
 /**
@@ -173,7 +175,7 @@ public void testUpdateChannelOther() {
 
     @Test
     public void testUpdateChannelPower() {
-        assertEquals(new DecimalType(10.8), device.updateChannel(CHANNEL_UID_ENERGY_POWER, deviceState),
+        assertEquals(new QuantityType<>(10.8, Units.WATT), device.updateChannel(CHANNEL_UID_ENERGY_POWER, deviceState),
                 "Power values should be set");
     }
 }
diff --git a/...c/test/java/org/openhab/binding/tplinksmarthome/internal/device/LightStripDeviceTest.java b/...c/test/java/org/openhab/binding/tplinksmarthome/internal/device/LightStripDeviceTest.java
@@ -34,6 +34,8 @@
 import org.openhab.core.library.types.HSBType;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.unit.Units;
 import org.openhab.core.types.UnDefType;
 
 /**
@@ -185,7 +187,7 @@ public void testUpdateChannelOther() {
 
     @Test
     public void testUpdateChannelPower() {
-        assertEquals(new DecimalType(10.8), device.updateChannel(CHANNEL_UID_ENERGY_POWER, deviceState),
+        assertEquals(new QuantityType<>(10.8, Units.WATT), device.updateChannel(CHANNEL_UID_ENERGY_POWER, deviceState),
                 "Power values should be set");
     }
 }