[insteon] use correct units of measure for watts and kWh (openhab#7565)

Signed-off-by: Rob Nielsen <rob.nielsen@yahoo.com>
andrewfg · Aug 31, 2020 · acd7c29 · acd7c29
1 parent f033ff2
commit acd7c29
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/bundles/org.openhab.binding.insteon/README.md b/bundles/org.openhab.binding.insteon/README.md
@@ -155,7 +155,7 @@ In order to determine which channels a device supports, you can look at the devi
 | keypadButtonF | Switch | Keypad Button F |
 | keypadButtonG | Switch | Keypad Button G |
 | keypadButtonH | Switch | Keypad Button H |
-| kWh | Number | Kilowatt Hour |
+| kWh | Number:Energy | Kilowatt Hour |
 | lastHeardFrom | DateTime | Last Heard From |
 | ledBrightness | Number | LED brightness |
 | ledOnOff | Switch | LED On/Off |
@@ -183,7 +183,7 @@ In order to determine which channels a device supports, you can look at the devi
 | temperature | Number:Temperature | Temperature |
 | topOutlet | Switch | Top Outlet |
 | update | Switch | Update |
-| watts | Number | Watts |
+| watts | Number:Power | Watts |
 
 
 ## Full Example
@@ -648,10 +648,10 @@ See the example below:
 **Items**
 
 ``` 
-    Number iMeterWatts   "iMeter [%d watts]"   { channel="insteon:device:home:AABBCC:watts" }
-    Number iMeterKwh     "iMeter [%.04f kwh]"  { channel="insteon:device:home:AABBCC:kwh" }
-    Switch iMeterUpdate  "iMeter Update"       { channel="insteon:device:home:AABBCC:update" }
-    Switch iMeterReset   "iMeter Reset"        { channel="insteon:device:home:AABBCC:reset" }
+    Number:Power  iMeterWatts   "iMeter [%d watts]"   { channel="insteon:device:home:AABBCC:watts" }
+    Number:Energy iMeterKwh     "iMeter [%.04f kWh]"  { channel="insteon:device:home:AABBCC:kWh" }
+    Switch        iMeterUpdate  "iMeter Update"       { channel="insteon:device:home:AABBCC:update" }
+    Switch        iMeterReset   "iMeter Reset"        { channel="insteon:device:home:AABBCC:reset" }
 ```
 
 ### Fan Controllers

diff --git a/...ing.insteon/src/main/java/org/openhab/binding/insteon/internal/device/MessageHandler.java b/...ing.insteon/src/main/java/org/openhab/binding/insteon/internal/device/MessageHandler.java
@@ -28,6 +28,7 @@
 import org.eclipse.smarthome.core.library.types.QuantityType;
 import org.eclipse.smarthome.core.library.unit.ImperialUnits;
 import org.eclipse.smarthome.core.library.unit.SIUnits;
+import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
 import org.eclipse.smarthome.core.types.State;
 import org.openhab.binding.insteon.internal.device.DeviceFeatureListener.StateChangeType;
 import org.openhab.binding.insteon.internal.device.GroupMessageStateMachine.GroupMessage;
@@ -820,8 +821,10 @@ public void handleMessage(int group, byte cmd1, Msg msg, DeviceFeature f, String
                     }
 
                     logger.debug("{}:{} watts: {} kwh: {} ", nm(), f.getDevice().getAddress(), watts, kwh);
-                    feature.publish(new DecimalType(kwh), StateChangeType.CHANGED, "field", "kwh");
-                    feature.publish(new DecimalType(watts), StateChangeType.CHANGED, "field", "watts");
+                    feature.publish(new QuantityType<>(kwh, SmartHomeUnits.KILOWATT_HOUR), StateChangeType.CHANGED,
+                            "field", "kwh");
+                    feature.publish(new QuantityType<>(watts, SmartHomeUnits.WATT), StateChangeType.CHANGED, "field",
+                            "watts");
                 } catch (FieldException e) {
                     logger.warn("error parsing {}: ", msg, e);
                 }

diff --git a/bundles/org.openhab.binding.insteon/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.insteon/src/main/resources/ESH-INF/thing/thing-types.xml
@@ -321,7 +321,7 @@
 	</channel-type>
 
 	<channel-type id="kWh">
-		<item-type>Number</item-type>
+		<item-type>Number:Energy</item-type>
 		<label>Kilowatt Hour</label>
 	</channel-type>
 
@@ -481,7 +481,7 @@
 	</channel-type>
 
 	<channel-type id="watts">
-		<item-type>Number</item-type>
+		<item-type>Number:Power</item-type>
 		<label>Watts</label>
 	</channel-type>