From e19c16565dc84363222ec8ef1f69994da99dd18e Mon Sep 17 00:00:00 2001
From: J-N-K <J-N-K@users.noreply.github.com>
Date: Tue, 8 Dec 2020 01:02:32 +0100
Subject: [PATCH] [deconz] add categories and tags to lights (where applicable)
 (#9257)

* add categories and tags (where applicable)
* also add tags for groups

Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
---
 .../OH-INF/thing/group-thing-types.xml        | 16 +++++++++++++
 .../OH-INF/thing/light-thing-types.xml        | 24 +++++++++++++++++++
 2 files changed, 40 insertions(+)

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 6b6cd10e4f..691c210220 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
@@ -9,6 +9,7 @@
 			<bridge-type-ref id="deconz"/>
 		</supported-bridge-type-refs>
 		<label>Light Group</label>
+		<category>Lightbulb</category>
 		<channels>
 			<channel typeId="all_on" id="all_on"/>
 			<channel typeId="any_on" id="any_on"/>
@@ -25,12 +26,16 @@
 	<channel-type id="alert">
 		<item-type>Switch</item-type>
 		<label>Alert</label>
+		<category>Alarm</category>
 	</channel-type>
 
 	<channel-type id="all_on">
 		<item-type>Switch</item-type>
 		<label>All On</label>
 		<description>"On" if all lights in this group are "On", otherwise "Off".</description>
+		<tags>
+			<tag>Lighting</tag>
+		</tags>
 		<state readOnly="true"/>
 	</channel-type>
 
@@ -38,16 +43,27 @@
 		<item-type>Switch</item-type>
 		<label>Any On</label>
 		<description>"On" if any light in this group is "On", otherwise "Off".</description>
+		<tags>
+			<tag>Lighting</tag>
+		</tags>
+		<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>
 
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 ce7c74b78f..745c2f1082 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
@@ -10,6 +10,7 @@
 		</supported-bridge-type-refs>
 		<label>Warning Device</label>
 		<description>A warning device</description>
+		<category>Siren</category>
 		<channels>
 			<channel id="alert" typeId="alert"></channel>
 		</channels>
@@ -25,6 +26,7 @@
 		</supported-bridge-type-refs>
 		<label>Window Covering</label>
 		<description>A device to cover windows.</description>
+		<category>Blinds</category>
 		<channels>
 			<channel typeId="position" id="position"/>
 		</channels>
@@ -55,6 +57,7 @@
 		</supported-bridge-type-refs>
 		<label>Dimmable Light</label>
 		<description>A dimmable light.</description>
+		<category>Lightbulb</category>
 		<channels>
 			<channel typeId="brightness" id="brightness"/>
 		</channels>
@@ -70,6 +73,7 @@
 		</supported-bridge-type-refs>
 		<label>Color-Temperature Light</label>
 		<description>A dimmable light with adjustable color temperature.</description>
+		<category>Lightbulb</category>
 		<channels>
 			<channel typeId="brightness" id="brightness"/>
 			<channel typeId="ct" id="color_temperature"/>
@@ -86,6 +90,7 @@
 		</supported-bridge-type-refs>
 		<label>Color Light</label>
 		<description>A dimmable light with adjustable color.</description>
+		<category>Lightbulb</category>
 		<channels>
 			<channel typeId="color" id="color"/>
 		</channels>
@@ -101,6 +106,7 @@
 		</supported-bridge-type-refs>
 		<label>Color Light</label>
 		<description>A dimmable light with adjustable color.</description>
+		<category>Lightbulb</category>
 		<channels>
 			<channel typeId="color" id="color"/>
 			<channel typeId="ct" id="color_temperature"/>
@@ -117,6 +123,7 @@
 		</supported-bridge-type-refs>
 		<label>Doorlock</label>
 		<description>A doorlock that can be locked (ON) or unlocked (OFF).</description>
+		<category>Lock</category>
 		<channels>
 			<channel typeId="lock" id="switch"/>
 		</channels>
@@ -129,34 +136,51 @@
 	<channel-type id="position">
 		<item-type>Rollershutter</item-type>
 		<label>Position</label>
+		<category>Rollershutter</category>
 		<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"/>
 	</channel-type>
 
 	<channel-type id="alert">
 		<item-type>Switch</item-type>
 		<label>Alert</label>
+		<category>Alarm</category>
 	</channel-type>
 
 	<channel-type id="lock">
-- 
2.47.3