[hue] Use system default channel types for lights (openhab#9856)

* Use system default channel types for lights Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
thinkingstone · Nov 7, 2021 · db16f3b · db16f3b
1 parent 7a98642
commit db16f3b
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 79 deletions.
diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_de.properties b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_de.properties
@@ -96,14 +96,6 @@ thing-type.config.hue.geofencesensor.on.label = Sensor Status
 thing-type.config.hue.geofencesensor.on.description = Aktiviert oder deaktiviert den Sensor.
 
 # channel types
-channel-type.hue.color.label = Farbe
-channel-type.hue.color.description = Ermöglicht die Steuerung der Farbe. Ermöglicht ebenfalls die Lampe zu dimmen oder ein- und auszuschalten.
-channel-type.hue.brightness.label = Helligkeit
-channel-type.hue.brightness.description = Ermöglicht die Steuerung der Helligkeit. Ermöglicht ebenfalls die Lampe ein- und auszuschalten.
-channel-type.hue.switch.label = Schalter
-channel-type.hue.switch.description = Ermöglicht das Ein- und Ausschalten.
-channel-type.hue.color_temperature.label = Farbtemperatur
-channel-type.hue.color_temperature.description = Ermöglicht die Steuerung der Farbtemperatur. Von Tageslichtweiß (0) bis Warmweiß (100).
 channel-type.hue.alert.label = Alarm
 channel-type.hue.alert.description = Ermöglicht ein temporäres Blinken.
 channel-type.hue.alert.state.option.NONE = Kein Blinken

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_fr.properties b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue_fr.properties
@@ -47,14 +47,6 @@ thing-type.config.hue.group.groupId.label = ID groupe
 thing-type.config.hue.group.groupId.description = L'identifiant de groupe identifie l'un des groupes d'ampoules hue ou une pièce.
 
 # channel types
-channel-type.hue.color.label = Couleur
-channel-type.hue.color.description = Permet de contrôler la couleur de l'ampoule. Il est également possible d'allumer ou d'éteindre l'ampoule ainsi que de faire varier son intensité lumineuse.
-channel-type.hue.brightness.label = Intensité lumineuse
-channel-type.hue.brightness.description = Permet de contrôler l'intensité lumineuse de l'ampoule. Il est également possible d'allumer ou d'éteindre l'ampoule.
-channel-type.hue.switch.label = Commutateur
-channel-type.hue.switch.description = Permet d'allumer ou d'éteindre l'ampoule.
-channel-type.hue.color_temperature.label = Température couleur
-channel-type.hue.color_temperature.description = Permet de choisir la température de couleur de l'ampoule entre 0 (froid) et 100 (chaud).
 channel-type.hue.alert.label = Mode alerte
 channel-type.hue.alert.description = Permet un changement temporaire de l'état de l'ampoule.
 channel-type.hue.alert.state.option.NONE = Sans alerte

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ColorLight.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ColorLight.xml
@@ -13,7 +13,7 @@
 		<description>A dimmable light with changeable colors.</description>
 
 		<channels>
-			<channel id="color" typeId="color"/>
+			<channel id="color" typeId="system.color"/>
 			<channel id="alert" typeId="alert"/>
 			<channel id="effect" typeId="effect"/>
 		</channels>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ColorTemperatureLight.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ColorTemperatureLight.xml
@@ -13,8 +13,8 @@
 		<description>A dimmable light with tunable color temperature.</description>
 
 		<channels>
-			<channel id="color_temperature" typeId="color_temperature"/>
-			<channel id="brightness" typeId="brightness"/>
+			<channel id="color_temperature" typeId="system.color-temperature"/>
+			<channel id="brightness" typeId="system.brightness"/>
 			<channel id="alert" typeId="alert"/>
 			<channel id="effect" typeId="effect"/>
 		</channels>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmableLight.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmableLight.xml
@@ -13,7 +13,7 @@
 		<description>A dimmable light.</description>
 
 		<channels>
-			<channel id="brightness" typeId="brightness"/>
+			<channel id="brightness" typeId="system.brightness"/>
 			<channel id="alert" typeId="alert"/>
 		</channels>
 

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmablePlug.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/DimmablePlug.xml
@@ -13,7 +13,7 @@
 		<description>An outlet that can be dimmed.</description>
 
 		<channels>
-			<channel id="brightness" typeId="brightness"/>
+			<channel id="brightness" typeId="system.brightness"/>
 		</channels>
 
 		<representation-property>uniqueId</representation-property>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ExtendedColorLight.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/ExtendedColorLight.xml
@@ -13,8 +13,8 @@
 		<description>A dimmable light with changeable colors and tunable color temperature.</description>
 
 		<channels>
-			<channel id="color" typeId="color"/>
-			<channel id="color_temperature" typeId="color_temperature"/>
+			<channel id="color" typeId="system.color"/>
+			<channel id="color_temperature" typeId="system.color-temperature"/>
 			<channel id="alert" typeId="alert"/>
 			<channel id="effect" typeId="effect"/>
 		</channels>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/Group.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/Group.xml
@@ -13,10 +13,10 @@
 		<description>A group of lights or a room that could be switched on and off.</description>
 
 		<channels>
-			<channel id="switch" typeId="switch"/>
-			<channel id="color_temperature" typeId="color_temperature"/>
-			<channel id="brightness" typeId="brightness"/>
-			<channel id="color" typeId="color"/>
+			<channel id="switch" typeId="system.power"/>
+			<channel id="color_temperature" typeId="system.color-temperature"/>
+			<channel id="brightness" typeId="system.brightness"/>
+			<channel id="color" typeId="system.color"/>
 			<channel id="alert" typeId="alert"/>
 			<channel id="scene" typeId="scene"/>
 		</channels>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/OnOffLight.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/OnOffLight.xml
@@ -13,7 +13,7 @@
 		<description>A light that could be switched on and off.</description>
 
 		<channels>
-			<channel id="switch" typeId="switch"/>
+			<channel id="switch" typeId="system.power"/>
 			<channel id="alert" typeId="alert"/>
 		</channels>
 

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/OnOffPlug.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/OnOffPlug.xml
@@ -13,7 +13,7 @@
 		<description>An outlet that could be switched on and off.</description>
 
 		<channels>
-			<channel id="switch" typeId="switch"/>
+			<channel id="switch" typeId="system.power"/>
 		</channels>
 
 		<representation-property>uniqueId</representation-property>

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/channels.xml
@@ -3,34 +3,6 @@
 	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
 	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
 
-	<!-- Color Channel -->
-	<channel-type id="color">
-		<item-type>Color</item-type>
-		<label>Color</label>
-		<description>The color channel allows to control the color of a light.
-			It is also possible to dim values and switch the
-			light on and off.
-		</description>
-		<category>ColorLight</category>
-		<tags>
-			<tag>Lighting</tag>
-		</tags>
-	</channel-type>
-
-	<!-- Brightness Channel -->
-	<channel-type id="brightness">
-		<item-type>Dimmer</item-type>
-		<label>Brightness</label>
-		<description>The brightness channel allows to control the brightness of a light.
-			It is also possible to switch the
-			light on and off.
-		</description>
-		<category>Light</category>
-		<tags>
-			<tag>Lighting</tag>
-		</tags>
-	</channel-type>
-
 	<channel-type id="last_updated">
 		<item-type>DateTime</item-type>
 		<label>Last Updated</label>
@@ -147,18 +119,6 @@
 		</event>
 	</channel-type>
 
-	<!-- Switch Channel -->
-	<channel-type id="switch">
-		<item-type>Switch</item-type>
-		<label>Switch</label>
-		<description>The switch channel allows to switch the light on and off.
-		</description>
-		<category>Light</category>
-		<tags>
-			<tag>Lighting</tag>
-		</tags>
-	</channel-type>
-
 	<!-- Temperature Channel -->
 	<channel-type id="temperature">
 		<item-type>Number:Temperature</item-type>
@@ -168,16 +128,6 @@
 		<state readOnly="true" pattern="%.1f %unit%"/>
 	</channel-type>
 
-	<!-- Color Temperature Channel -->
-	<channel-type id="color_temperature">
-		<item-type>Dimmer</item-type>
-		<label>Color Temperature</label>
-		<description>The color temperature channel allows to set the color
-			temperature of a light from 0 (cold) to 100 (warm).
-		</description>
-		<category>ColorLight</category>
-	</channel-type>
-
 	<!-- Alert Channel -->
 	<channel-type id="alert" advanced="true">
 		<item-type>String</item-type>