Skip to content

Commit

Permalink
[tradfri] Use system default channel types for lights (openhab#9864)
Browse files Browse the repository at this point in the history 
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
  • Loading branch information
@cweitkamp
cweitkamp authored Jan 24, 2021
1 parent e617a93 commit 0f149e8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 35 deletions.
6 changes: 0 additions & 6 deletions bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/i18n/tradfri_de.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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).
34 changes: 5 additions & 29 deletions bundles/org.openhab.binding.tradfri/src/main/resources/OH-INF/thing/thing-types.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -176,35 +176,11 @@
<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>
<description>Control the position of the blind or curtain in percent from 0 (open) to 100 (closed).</description>
<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>

0 comments on commit 0f149e8

Please sign in to comment.