[tradfri] Use system default channel types for lights (#9864)

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>

diff --git a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_de.properties b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_de.properties
index 9793ad0cb60cd770dd13ac2ede421f93095a5514..9d932658d229039591fdd60321720457497437ca 100644 (file)
--- a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_de.properties
+++ b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_de.properties
@@ -37,11 +37,5 @@ thing-type.config.tradfri.device.id.label = ID des Ger
 thing-type.config.tradfri.device.id.description = ID zur Identifikation des Gerätes.
 
 # channel types
-channel-type.tradfri.brightness.label = Helligkeit
-channel-type.tradfri.brightness.description = Ermöglicht die Steuerung der Helligkeit. Ermöglicht ebenfalls die Lampe ein- und auszuschalten.
-channel-type.tradfri.color_temperature.label = Farbtemperatur
-channel-type.tradfri.color_temperature.description = Ermöglicht die Steuerung der Farbtemperatur. Von Tageslichtweiß (0) bis Warmweiß (100).
-channel-type.tradfri.color.label = Farbe
-channel-type.tradfri.color.description = Ermöglicht die Steuerung der Farbe.
 channel-type.tradfri.position.label = Position
 channel-type.tradfri.position.description = Ermöglicht die Steuerung der Position von Offen (0) bis Geschlossen (100).

diff --git a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/thing/thing-types.xml
index f767acec7cd5e1978bd4201206ad1aa9705859ed..7d989ea2865e8b425774fa645f19b6002c0dfc45 100644 (file)
--- a/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/thing/thing-types.xml
@@ -41,7 +41,7 @@
                <description>A light that has continuous brightness control.</description>
 
                <channels>
-                       <channel id="brightness" typeId="brightness"/>
+                       <channel id="brightness" typeId="system.brightness"/>
                </channels>
 
                <representation-property>id</representation-property>
@@ -58,8 +58,8 @@
                <description>A dimmable light that supports different color temperature settings.</description>
 
                <channels>
-                       <channel id="brightness" typeId="brightness"/>
-                       <channel id="color_temperature" typeId="color_temperature"/>
+                       <channel id="brightness" typeId="system.brightness"/>
+                       <channel id="color_temperature" typeId="system.color-temperature"/>
                </channels>
 
                <representation-property>id</representation-property>
@@ -76,8 +76,8 @@
                <description>A dimmable light that supports full colors and color temperature settings.</description>
 
                <channels>
-                       <channel id="color_temperature" typeId="color_temperature"/>
-                       <channel id="color" typeId="color"/>
+                       <channel id="color_temperature" typeId="system.color-temperature"/>
+                       <channel id="color" typeId="system.color"/>
                </channels>
 
                <representation-property>id</representation-property>
@@ -176,16 +176,6 @@
                <config-description-ref uri="thing-type:tradfri:device"/>
        </thing-type>
 
-       <channel-type id="brightness">
-               <item-type>Dimmer</item-type>
-               <label>Brightness</label>
-               <description>Control the brightness and switch the light on and off.</description>
-               <category>DimmableLight</category>
-               <tags>
-                       <tag>Lighting</tag>
-               </tags>
-       </channel-type>
-
        <channel-type id="position">
                <item-type>Rollershutter</item-type>
                <label>Position</label>
@@ -193,18 +183,4 @@
                <category>Blinds</category>
        </channel-type>
 
-       <channel-type id="color_temperature">
-               <item-type>Dimmer</item-type>
-               <label>Color Temperature</label>
-               <description>Control the color temperature of the light.</description>
-               <category>ColorLight</category>
-       </channel-type>
-
-       <channel-type id="color">
-               <item-type>Color</item-type>
-               <label>Color</label>
-               <description>Control the color of the light.</description>
-               <category>ColorLight</category>
-       </channel-type>
-
 </thing:thing-descriptions>