From 9ee4e942e80743041330d62a5846bfb258bb4436 Mon Sep 17 00:00:00 2001
From: Christoph Weitkamp <github@christophweitkamp.de>
Date: Fri, 12 Feb 2021 11:52:18 +0100
Subject: [PATCH] [deconz] Use system default channel types for lights (#10126)

* Use system default channel types for lights

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
---
 .../OH-INF/i18n/deconz_de.properties          |  3 ++
 .../OH-INF/thing/group-thing-types.xml        | 34 +------------
 .../OH-INF/thing/light-thing-types.xml        | 48 ++++---------------
 .../OH-INF/thing/sensor-thing-types.xml       |  9 +---
 4 files changed, 15 insertions(+), 79 deletions(-)

diff --git a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz_de.properties b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz_de.properties
index 32837cc77..9fe1f7f6e 100644
--- a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz_de.properties
+++ b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz_de.properties
@@ -10,6 +10,9 @@ thing-type.config.deconz.sensor.id.description = ID zur Identifikation des Senso
 thing-type.config.deconz.sensor.lastSeenPolling.label = Abfrageintervall
 thing-type.config.deconz.sensor.lastSeenPolling.description = Intervall zur Abfrage des deCONZ-Gateways nach dem "last_seen" Channel dieses Sensors. Polling wird deaktiviert, wenn der Wert auf 0 eingestellt wird (Standard: 1440, einmal pro Tag).
 
+channel-type.deconz.ct.label = Farbtemperatur
+channel-type.deconz.ct.description = Steuert die Farbtemperatur des Lichts in Kelvin.
+
 channel-type.deconz.last_updated.label = Letzte Aktualisierung
 channel-type.deconz.last_updated.description = Zeit, zu der sich dieser Wert geändert hat.
 channel-type.deconz.last_updated.options.pattern = %1$td.%1$tm.%1$tY %1$tH:%1$tM:%1$tS
diff --git a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/group-thing-types.xml b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/group-thing-types.xml
index f56d300fd..dda792466 100644
--- a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/group-thing-types.xml
+++ b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/group-thing-types.xml
@@ -14,7 +14,7 @@
 			<channel typeId="all_on" id="all_on"/>
 			<channel typeId="any_on" id="any_on"/>
 			<channel typeId="alert" id="alert"/>
-			<channel typeId="color" id="color"/>
+			<channel typeId="system.color" id="color"/>
 			<channel typeId="ct" id="color_temperature"/>
 			<channel typeId="scene" id="scene"/>
 		</channels>
@@ -24,19 +24,6 @@
 		<config-description-ref uri="thing-type:deconz:sensor"/>
 	</thing-type>
 
-	<channel-type id="alert">
-		<item-type>String</item-type>
-		<label>Alert</label>
-		<category>Alarm</category>
-		<command>
-			<options>
-				<option value="none">No Alarm</option>
-				<option value="select">Blinking (short time)</option>
-				<option value="lselect">Blinking (long time)</option>
-			</options>
-		</command>
-	</channel-type>
-
 	<channel-type id="all_on">
 		<item-type>Switch</item-type>
 		<label>All On</label>
@@ -57,24 +44,6 @@
 		<state readOnly="true"/>
 	</channel-type>
 
-	<channel-type id="color">
-		<item-type>Color</item-type>
-		<label>Color</label>
-		<category>Colorpicker</category>
-		<tags>
-			<tag>Lighting</tag>
-		</tags>
-	</channel-type>
-
-	<channel-type id="ct">
-		<item-type>Number</item-type>
-		<label>Color Temperature</label>
-		<tags>
-			<tag>Lighting</tag>
-		</tags>
-		<state pattern="%d K" min="15" max="100000" step="100"/>
-	</channel-type>
-
 	<channel-type id="scene">
 		<item-type>String</item-type>
 		<label>Recall Scene</label>
@@ -83,5 +52,4 @@
 		</tags>
 	</channel-type>
 
-
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/light-thing-types.xml b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/light-thing-types.xml
index 4339cae22..94ef679fd 100644
--- a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/light-thing-types.xml
+++ b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/light-thing-types.xml
@@ -43,7 +43,7 @@
 		<label>On/Off Light</label>
 		<description>A light that can be turned on or off.</description>
 		<channels>
-			<channel typeId="onoff" id="switch"/>
+			<channel typeId="system.power" id="switch"/>
 			<channel typeId="ontime" id="ontime"/>
 		</channels>
 
@@ -60,7 +60,7 @@
 		<description>A dimmable light.</description>
 		<category>Lightbulb</category>
 		<channels>
-			<channel typeId="brightness" id="brightness"/>
+			<channel typeId="system.brightness" id="brightness"/>
 			<channel typeId="ontime" id="ontime"/>
 			<channel id="alert" typeId="alert"></channel>
 		</channels>
@@ -78,7 +78,7 @@
 		<description>A dimmable light with adjustable color temperature.</description>
 		<category>Lightbulb</category>
 		<channels>
-			<channel typeId="brightness" id="brightness"/>
+			<channel typeId="system.brightness" id="brightness"/>
 			<channel typeId="ct" id="color_temperature"/>
 			<channel typeId="ontime" id="ontime"/>
 			<channel id="alert" typeId="alert"></channel>
@@ -97,7 +97,7 @@
 		<description>A dimmable light with adjustable color.</description>
 		<category>Lightbulb</category>
 		<channels>
-			<channel typeId="color" id="color"/>
+			<channel typeId="system.color" id="color"/>
 			<channel typeId="ontime" id="ontime"/>
 			<channel id="alert" typeId="alert"></channel>
 		</channels>
@@ -115,8 +115,8 @@
 		<description>A dimmable light with adjustable color.</description>
 		<category>Lightbulb</category>
 		<channels>
-			<channel typeId="color" id="color"/>
-			<channel typeId="ct" id="color_temperature"/>
+			<channel typeId="system.color" id="color"/>
+			<channel typeId="system.system.color-temperature-abs" id="color_temperature"/>
 			<channel typeId="ontime" id="ontime"/>
 			<channel id="alert" typeId="alert"></channel>
 		</channels>
@@ -149,41 +149,12 @@
 		<state pattern="%.1f %%"/>
 	</channel-type>
 
-	<channel-type id="onoff">
-		<item-type>Switch</item-type>
-		<label>On/Off</label>
-		<category>Switch</category>
-		<tags>
-			<tag>Switchable</tag>
-		</tags>
-	</channel-type>
-
-	<channel-type id="brightness">
-		<item-type>Dimmer</item-type>
-		<label>Brightness</label>
-		<category>Slider</category>
-		<tags>
-			<tag>Lighting</tag>
-		</tags>
-		<state pattern="%.1f %%"/>
-	</channel-type>
-
-	<channel-type id="color">
-		<item-type>Color</item-type>
-		<label>Color</label>
-		<category>Colorpicker</category>
-		<tags>
-			<tag>Lighting</tag>
-		</tags>
-	</channel-type>
-
 	<channel-type id="ct">
 		<item-type>Number</item-type>
 		<label>Color Temperature</label>
-		<tags>
-			<tag>Lighting</tag>
-		</tags>
-		<state pattern="%d K" min="15" max="100000" step="100"/>
+		<description>Controls the color temperature of the light in Kelvin</description>
+		<category>ColorLight</category>
+		<state pattern="%.0f K" min="1000" max="10000"/>
 	</channel-type>
 
 	<channel-type id="ontime">
@@ -226,4 +197,5 @@
 		<item-type>Switch</item-type>
 		<label>Lock</label>
 	</channel-type>
+
 </thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/sensor-thing-types.xml b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/sensor-thing-types.xml
index a0c93106d..5f26c7ff4 100644
--- a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/sensor-thing-types.xml
+++ b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/thing/sensor-thing-types.xml
@@ -106,7 +106,7 @@
 		</supported-bridge-type-refs>
 		<label>Color Controller</label>
 		<channels>
-			<channel typeId="color" id="color"/>
+			<channel typeId="system.color" id="color"/>
 			<channel typeId="buttonevent" id="buttonevent"/>
 			<channel typeId="button" id="button"/>
 			<channel typeId="last_updated" id="last_updated"/>
@@ -117,13 +117,6 @@
 		<config-description-ref uri="thing-type:deconz:sensor"/>
 	</thing-type>
 
-	<channel-type id="color">
-		<item-type>Color</item-type>
-		<label>Color</label>
-		<description>Allows to control a color</description>
-		<state readOnly="true"></state>
-	</channel-type>
-
 	<thing-type id="switch">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="deconz"/>