This repository has been archived by the owner on May 7, 2020. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Tradfri] Added FLOALT panels (#4366)
* Added FLOALT panels to COLOR_TEMP_MODELS * Added LED-bulb E27 950 lm to COLOR_TEMP_MODELS * Added representation-property; Refactored xml files; * Applied formatter on xml files; * Changed spelling of TRÅDFRI Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
- Loading branch information
1 parent
8bc1a0f
commit 1e308ce
Showing
9 changed files
with
164 additions
and
165 deletions.
There are no files selected for viewing
11 changes: 5 additions & 6 deletions
11
extensions/binding/org.eclipse.smarthome.binding.tradfri/ESH-INF/binding/binding.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,9 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <binding:binding id="tradfri" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns:binding="http://eclipse.org/smarthome/schemas/binding/v1.0.0" | ||
| xsi:schemaLocation="http://eclipse.org/smarthome/schemas/binding/v1.0.0 http://eclipse.org/smarthome/schemas/binding-1.0.0.xsd"> | ||
| <binding:binding id="tradfri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns:binding="http://eclipse.org/smarthome/schemas/binding/v1.0.0" | ||
| xsi:schemaLocation="http://eclipse.org/smarthome/schemas/binding/v1.0.0 http://eclipse.org/smarthome/schemas/binding-1.0.0.xsd"> | ||
|
|
||
| <name>Trådfri Binding</name> | ||
| <description>This binding supports IKEA Trådfri lighting devices through the IKEA gateway.</description> | ||
| <name>TRÅDFRI Binding</name> | ||
| <description>This binding supports IKEA TRÅDFRI lighting devices through the IKEA gateway.</description> | ||
|
|
||
| </binding:binding> |
13 changes: 13 additions & 0 deletions
13
extensions/binding/org.eclipse.smarthome.binding.tradfri/ESH-INF/config/config.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <config-description:config-descriptions | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:config-description="http://eclipse.org/smarthome/schemas/config-description/v1.0.0" | ||
| xsi:schemaLocation="http://eclipse.org/smarthome/schemas/config-description/v1.0.0 http://eclipse.org/smarthome/schemas/config-description-1.0.0.xsd"> | ||
|
|
||
| <config-description uri="thing-type:tradfri:device"> | ||
| <parameter name="id" type="integer" required="true"> | ||
| <label>ID</label> | ||
| <description>The identifier of the device on the gateway.</description> | ||
| </parameter> | ||
| </config-description> | ||
|
|
||
| </config-description:config-descriptions> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
257 changes: 122 additions & 135 deletions
257
extensions/binding/org.eclipse.smarthome.binding.tradfri/ESH-INF/thing/thing-types.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,139 +1,126 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <thing:thing-descriptions bindingId="tradfri" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0" | ||
| xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd"> | ||
|
|
||
| <bridge-type id="gateway"> | ||
| <label>TRÅDFRI Gateway</label> | ||
| <description>IKEA TRÅDFRI IP Gateway</description> | ||
|
|
||
| <config-description> | ||
| <parameter name="host" type="text" required="true"> | ||
| <context>network-address</context> | ||
| <label>Host</label> | ||
| <description>Hostname or IP address of the IKEA Trådfri gateway</description> | ||
| </parameter> | ||
| <parameter name="port" type="integer" required="false"> | ||
| <label>Port</label> | ||
| <description>Port for accessing the gateway</description> | ||
| <advanced>true</advanced> | ||
| <default>5684</default> | ||
| </parameter> | ||
| <parameter name="code" type="text" required="true"> | ||
| <context>password</context> | ||
| <label>Security Code</label> | ||
| <description>Security code printed on the label underneath the gateway.</description> | ||
| </parameter> | ||
| </config-description> | ||
| </bridge-type> | ||
|
|
||
| <!-- thing types for devices --> | ||
| <!-- their IDs refer to the Zigbee Lightlink device ids (see chapter 2.2 in https://www.nxp.com/documents/user_manual/JN-UG-3091.pdf) --> | ||
| <thing-type id="0100"> | ||
| <supported-bridge-type-refs> | ||
| <bridge-type-ref id="gateway"/> | ||
| </supported-bridge-type-refs> | ||
|
|
||
| <label>Dimmable Light</label> | ||
| <description>A light that has continuous brightness control.</description> | ||
|
|
||
| <channels> | ||
| <channel id="brightness" typeId="brightness"/> | ||
| </channels> | ||
|
|
||
| <config-description> | ||
| <parameter name="id" type="integer" required="true"> | ||
| <label>ID</label> | ||
| <description>The identifier of the light on the gateway</description> | ||
| </parameter> | ||
| </config-description> | ||
| </thing-type> | ||
|
|
||
| <thing-type id="0220"> | ||
| <supported-bridge-type-refs> | ||
| <bridge-type-ref id="gateway"/> | ||
| </supported-bridge-type-refs> | ||
|
|
||
| <label>Color Temperature Light</label> | ||
| <description>A dimmable light that supports different color temperature settings.</description> | ||
|
|
||
| <channels> | ||
| <channel id="brightness" typeId="brightness"/> | ||
| <channel id="color_temperature" typeId="color_temperature"/> | ||
| </channels> | ||
|
|
||
| <config-description> | ||
| <parameter name="id" type="integer" required="true"> | ||
| <label>ID</label> | ||
| <description>The identifier of the light on the gateway</description> | ||
| </parameter> | ||
| </config-description> | ||
| </thing-type> | ||
|
|
||
| <thing-type id="0210"> | ||
| <supported-bridge-type-refs> | ||
| <bridge-type-ref id="gateway"/> | ||
| </supported-bridge-type-refs> | ||
|
|
||
| <label>Color Light</label> | ||
| <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"/> | ||
| </channels> | ||
|
|
||
| <config-description> | ||
| <parameter name="id" type="integer" required="true"> | ||
| <label>ID</label> | ||
| <description>The identifier of the light on the gateway</description> | ||
| </parameter> | ||
| </config-description> | ||
| </thing-type> | ||
|
|
||
| <!-- note that this isn't yet supported by the code as we do not receive any data from the gateway for it --> | ||
| <thing-type id="0820" listed="false"> | ||
| <supported-bridge-type-refs> | ||
| <bridge-type-ref id="gateway"/> | ||
| </supported-bridge-type-refs> | ||
|
|
||
| <label>Non-Color Control Unit</label> | ||
|
|
||
| <channels> | ||
| <channel id="brightness" typeId="brightness"/> | ||
| </channels> | ||
|
|
||
| <config-description> | ||
| <parameter name="id" type="integer" required="true"> | ||
| <label>ID</label> | ||
| <description>The identifier of the controller on the gateway</description> | ||
| </parameter> | ||
| </config-description> | ||
| </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="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> | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0" | ||
| xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd"> | ||
|
|
||
| <bridge-type id="gateway"> | ||
| <label>TRÅDFRI Gateway</label> | ||
| <description>IKEA TRÅDFRI IP Gateway</description> | ||
|
|
||
| <config-description> | ||
| <parameter name="host" type="text" required="true"> | ||
| <context>network-address</context> | ||
| <label>Host</label> | ||
| <description>Hostname or IP address of the IKEA TRÅDFRI gateway</description> | ||
| </parameter> | ||
| <parameter name="port" type="integer" required="false"> | ||
| <label>Port</label> | ||
| <description>Port for accessing the gateway</description> | ||
| <advanced>true</advanced> | ||
| <default>5684</default> | ||
| </parameter> | ||
| <parameter name="code" type="text" required="true"> | ||
| <context>password</context> | ||
| <label>Security Code</label> | ||
| <description>Security code printed on the label underneath the gateway.</description> | ||
| </parameter> | ||
| </config-description> | ||
| </bridge-type> | ||
|
|
||
| <!-- thing types for devices --> | ||
| <!-- their IDs refer to the Zigbee Lightlink device ids (see chapter 2.2 in https://www.nxp.com/documents/user_manual/JN-UG-3091.pdf) --> | ||
| <thing-type id="0100"> | ||
| <supported-bridge-type-refs> | ||
| <bridge-type-ref id="gateway" /> | ||
| </supported-bridge-type-refs> | ||
|
|
||
| <label>Dimmable Light</label> | ||
| <description>A light that has continuous brightness control.</description> | ||
|
|
||
| <channels> | ||
| <channel id="brightness" typeId="brightness" /> | ||
| </channels> | ||
|
|
||
| <representation-property>id</representation-property> | ||
|
|
||
| <config-description-ref uri="thing-type:tradfri:device" /> | ||
| </thing-type> | ||
|
|
||
| <thing-type id="0220"> | ||
| <supported-bridge-type-refs> | ||
| <bridge-type-ref id="gateway" /> | ||
| </supported-bridge-type-refs> | ||
|
|
||
| <label>Color Temperature Light</label> | ||
| <description>A dimmable light that supports different color temperature settings.</description> | ||
|
|
||
| <channels> | ||
| <channel id="brightness" typeId="brightness" /> | ||
| <channel id="color_temperature" typeId="color_temperature" /> | ||
| </channels> | ||
|
|
||
| <representation-property>id</representation-property> | ||
|
|
||
| <config-description-ref uri="thing-type:tradfri:device" /> | ||
| </thing-type> | ||
|
|
||
| <thing-type id="0210"> | ||
| <supported-bridge-type-refs> | ||
| <bridge-type-ref id="gateway" /> | ||
| </supported-bridge-type-refs> | ||
|
|
||
| <label>Color Light</label> | ||
| <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" /> | ||
| </channels> | ||
|
|
||
| <representation-property>id</representation-property> | ||
|
|
||
| <config-description-ref uri="thing-type:tradfri:device" /> | ||
| </thing-type> | ||
|
|
||
| <!-- note that this isn't yet supported by the code as we do not receive any data from the gateway for it --> | ||
| <thing-type id="0820" listed="false"> | ||
| <supported-bridge-type-refs> | ||
| <bridge-type-ref id="gateway" /> | ||
| </supported-bridge-type-refs> | ||
|
|
||
| <label>Non-Color Control Unit</label> | ||
|
|
||
| <channels> | ||
| <channel id="brightness" typeId="brightness" /> | ||
| </channels> | ||
|
|
||
| <representation-property>id</representation-property> | ||
|
|
||
| <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="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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
extensions/binding/org.eclipse.smarthome.binding.tradfri/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters