From 22dce4d6937b6827f6e09169b559cc93239675d7 Mon Sep 17 00:00:00 2001
From: Cody Cutrer <cody@cutrer.us>
Date: Wed, 11 Dec 2024 00:12:06 -0700
Subject: [PATCH] [wiz] Correct units for RSSI (#17867)

Number:Power of dBm, instead of Number:Dimensionless of dB.

Signed-off-by: Cody Cutrer <cody@cutrer.us>
Signed-off-by: Ciprian Pascu <contact@ciprianpascu.ro>
---
 .../wiz/internal/handler/WizHandler.java      |  2 +-
 .../resources/OH-INF/thing/thing-types.xml    | 20 ++++++-
 .../resources/OH-INF/update/instructions.xml  | 54 +++++++++++++++++++
 3 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 bundles/org.openhab.binding.wiz/src/main/resources/OH-INF/update/instructions.xml

diff --git a/bundles/org.openhab.binding.wiz/src/main/java/org/openhab/binding/wiz/internal/handler/WizHandler.java b/bundles/org.openhab.binding.wiz/src/main/java/org/openhab/binding/wiz/internal/handler/WizHandler.java
index 1b91a47ebf7..f6108051c2f 100644
--- a/bundles/org.openhab.binding.wiz/src/main/java/org/openhab/binding/wiz/internal/handler/WizHandler.java
+++ b/bundles/org.openhab.binding.wiz/src/main/java/org/openhab/binding/wiz/internal/handler/WizHandler.java
@@ -592,7 +592,7 @@ public class WizHandler extends BaseThingHandler {
                 strength = 4;
             }
             updateDeviceState(CHANNEL_SIGNAL_STRENGTH, new DecimalType(strength));
-            updateDeviceState(CHANNEL_RSSI, new QuantityType<>(receivedParam.rssi, Units.DECIBEL));
+            updateDeviceState(CHANNEL_RSSI, new QuantityType<>(receivedParam.rssi, Units.DECIBEL_MILLIWATTS));
         }
     }
 
diff --git a/bundles/org.openhab.binding.wiz/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.wiz/src/main/resources/OH-INF/thing/thing-types.xml
index 9b6b103643d..a5e1c78a640 100644
--- a/bundles/org.openhab.binding.wiz/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.wiz/src/main/resources/OH-INF/thing/thing-types.xml
@@ -17,6 +17,9 @@
 			<channel id="last-update" typeId="last-update"/>
 			<channel id="rssi" typeId="rssi"/>
 		</channels>
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
 		<config-description-ref uri="thing-type:wiz:device"/>
 	</thing-type>
 
@@ -34,6 +37,9 @@
 			<channel id="last-update" typeId="last-update"/>
 			<channel id="rssi" typeId="rssi"/>
 		</channels>
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
 		<config-description-ref uri="thing-type:wiz:device"/>
 	</thing-type>
 
@@ -49,6 +55,9 @@
 			<channel id="last-update" typeId="last-update"/>
 			<channel id="rssi" typeId="rssi"/>
 		</channels>
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
 		<config-description-ref uri="thing-type:wiz:device"/>
 	</thing-type>
 
@@ -62,6 +71,9 @@
 			<channel id="last-update" typeId="last-update"/>
 			<channel id="rssi" typeId="rssi"/>
 		</channels>
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
 		<config-description-ref uri="thing-type:wiz:device"/>
 	</thing-type>
 
@@ -78,6 +90,9 @@
 			<channel id="last-update" typeId="last-update"/>
 			<channel id="rssi" typeId="rssi"/>
 		</channels>
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
 		<config-description-ref uri="thing-type:wiz:device"/>
 	</thing-type>
 
@@ -90,6 +105,9 @@
 			<channel-group id="light" typeId="dimmable-light"/>
 			<channel-group id="fan" typeId="fan-group"/>
 		</channel-groups>
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
 		<config-description-ref uri="thing-type:wiz:device"/>
 	</thing-type>
 
@@ -185,7 +203,7 @@
 	</channel-type>
 
 	<channel-type id="rssi" advanced="true">
-		<item-type unitHint="dB">Number:Dimensionless</item-type>
+		<item-type unitHint="dBm">Number:Power</item-type>
 		<label>RSSI</label>
 		<description>WiFi Received Signal Strength Indicator</description>
 		<category>QualityOfService</category>
diff --git a/bundles/org.openhab.binding.wiz/src/main/resources/OH-INF/update/instructions.xml b/bundles/org.openhab.binding.wiz/src/main/resources/OH-INF/update/instructions.xml
new file mode 100644
index 00000000000..febf38265f6
--- /dev/null
+++ b/bundles/org.openhab.binding.wiz/src/main/resources/OH-INF/update/instructions.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<update:update-descriptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:update="https://openhab.org/schemas/update-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/update-description/v1.0.0 https://openhab.org/schemas/update-description-1.0.0.xsd">
+
+	<thing-type uid="wiz:color-bulb">
+		<instruction-set targetVersion="1">
+			<update-channel id="rssi">
+				<type>wiz:rssi</type>
+			</update-channel>
+		</instruction-set>
+	</thing-type>
+
+	<thing-type uid="wiz:tunable-bulb">
+		<instruction-set targetVersion="1">
+			<update-channel id="rssi">
+				<type>wiz:rssi</type>
+			</update-channel>
+		</instruction-set>
+	</thing-type>
+
+	<thing-type uid="wiz:dimmable-bulb">
+		<instruction-set targetVersion="1">
+			<update-channel id="rssi">
+				<type>wiz:rssi</type>
+			</update-channel>
+		</instruction-set>
+	</thing-type>
+
+	<thing-type uid="wiz:plug">
+		<instruction-set targetVersion="1">
+			<update-channel id="rssi">
+				<type>wiz:rssi</type>
+			</update-channel>
+		</instruction-set>
+	</thing-type>
+
+	<thing-type uid="wiz:fan">
+		<instruction-set targetVersion="1">
+			<update-channel id="rssi">
+				<type>wiz:rssi</type>
+			</update-channel>
+		</instruction-set>
+	</thing-type>
+
+	<thing-type uid="wiz:fan-with-dimmable-bulb">
+		<instruction-set targetVersion="1">
+			<update-channel id="rssi">
+				<type>wiz:rssi</type>
+			</update-channel>
+		</instruction-set>
+	</thing-type>
+
+</update:update-descriptions>