Updated external content (Jenkins build 1020)

pull/1969/head
openHAB Build Server 2022-07-02 04:50:45 +00:00
parent 54f247b5c0
commit e9a9297512
7 changed files with 91 additions and 25 deletions

File diff suppressed because one or more lines are too long

View File

@ -27,6 +27,8 @@ Currently, these things are supported:
- device (single device/ballast on the DALI bus)
- group (group of DALI devices)
- rgb (virtual device consisting of three directly addressed devices that represent r/g/b (LED) color channels)
- device-dt8 (single device/ballast supporting DT8 (single-channel RGB & color temperature control))
- group-dt8 (group of DALI devices supporting DT8)
This binding was tested on a DALI 1 bus with daliserver 0.2.
@ -51,9 +53,10 @@ Automatic device discovery is not yet implemented.
### group
| Parameter | Parameter ID | Required/Optional | description |
|-------------|--------------|-------------------|----------------------------------------|
| Group ID | targetId | Required | Address of group in the DALI bus |
| Parameter | Parameter ID | Required/Optional | description |
|----------------|--------------------|-------------------|----------------------------------------------------------------------------------------------|
| Group ID | targetId | Required | Address of group in the DALI bus |
| Read Device ID | readDeviceTargetId | Optional | If reading values from this group fails, you can choose to read from a single device instead |
### rgb
@ -63,6 +66,19 @@ Automatic device discovery is not yet implemented.
| G Device ID | targetIdG | Required | Address of device in the DALI bus |
| B Device ID | targetIdB | Required | Address of device in the DALI bus |
### device-dt8
| Parameter | Parameter ID | Required/Optional | description |
|-------------|--------------|-------------------|----------------------------------------|
| Device ID | targetId | Required | Address of device in the DALI bus |
### group-dt8
| Parameter | Parameter ID | Required/Optional | description |
|----------------|--------------------|-------------------|----------------------------------------------------------------------------------------------|
| Group ID | targetId | Required | Address of group in the DALI bus |
| Read Device ID | readDeviceTargetId | Optional | If reading values from this group fails, you can choose to read from a single device instead |
## Full Example
.things file
@ -71,7 +87,7 @@ Automatic device discovery is not yet implemented.
Bridge dali:daliserver:237dbae7 "Daliserver" [ host="localhost", port=55825] {
Thing rgb 87bf0403-a45d-4037-b874-28f4ece30004 "RGB Lights" [ targetIdR=0, targetIdG=1, targetIdB=2 ]
Thing device 995e16ca-07c4-4111-9cda-504cb5120f82 "Warm White" [ targetId=3 ]
Thing group 31da8dac-8e09-455a-bc7a-6ed70f740001 "Living Room Lights" [ targetId=0 ]
Thing group 31da8dac-8e09-455a-bc7a-6ed70f740001 "Living Room Lights" [ targetId=0, readDeviceTargetId=3 ]
}
```

View File

@ -40,17 +40,16 @@ An account must be specified, all things for an account are discovered automatic
There are several settings for an account:
| Name | Required | Description |
|-----------------------|----------|-----------------------------------------------------------------------------------------------------|
| **email** | yes | The email address for logging into the Gardena smart system |
| **password** | yes | The password for logging into the Gardena smart system |
| **apiKey** | yes | The Gardena smart system integration API key |
| **connectionTimeout** | no | The timeout in seconds for connections to Gardena smart system integration API (default = 10) |
| Name | Required | Description |
|-----------------------|----------|-----------------------------------------------------------------------------------------------|
| **apiSecret** | yes | The Gardena smart system integration API secret |
| **apiKey** | yes | The Gardena smart system integration API key |
| **connectionTimeout** | no | The timeout in seconds for connections to Gardena smart system integration API (default = 10) |
### Obtaining your API Key
1. Goto https://developer.husqvarnagroup.cloud/, sign in using your GARDENA smart system account and accept the terms of use
2. Create and save a new application via the 'Create application' button
2. Create and save a new application via the 'Create application' button. The Redirect URLs do not matter, you can enter what you want (e.g. http://localhost:8080)
3. Connect both _Authentication API_ and _GARDENA smart system API_ to your application via the 'Connect new API' button
4. Copy the application key to use with this binding as _apiKey_
@ -61,14 +60,14 @@ There are several settings for an account:
Minimal Thing configuration:
```java
Bridge gardena:account:home [ email="...", password="...", apiKey="..." ]
Bridge gardena:account:home [ apiSecret="...", apiKey="..." ]
```
Configuration of multiple bridges:
```java
Bridge gardena:account:home1 [ email="...", password="...", apiKey="..." ]
Bridge gardena:account:home2 [ email="...", password="...", apiKey="..." ]
Bridge gardena:account:home1 [ apiSecret="...", apiKey="..." ]
Bridge gardena:account:home2 [ apiSecret="...", apiKey="..." ]
```
Once a connection to an account is established, connected Things are discovered automatically.
@ -76,7 +75,7 @@ Once a connection to an account is established, connected Things are discovered
Alternatively, you can manually configure Things:
```java
Bridge gardena:account:home [ email="...", password="...", apiKey="..." ]
Bridge gardena:account:home [ apiSecret="...", apiKey="..." ]
{
Thing mower myMower [ deviceId="c81ad682-6e45-42ce-bed1-6b4eff5620c8" ]
Thing water_control myWaterControl [ deviceId="c81ad682-6e45-42ce-bed1-6b4eff5620c8" ]

View File

@ -256,7 +256,7 @@ The following devices have been tested by openHAB users with the binding. This l
| Busch-Jaeger 6735 | Control Element (1-channel) |
| Busch-Jaeger 6735/01 | Control Element (1-channel, battery-operated) |
| Busch-Jaeger 6736 | Control Element (2-channel) |
| Clipsal Iconic dimmers and swtiches | Switches and dimmers |
| Clipsal Iconic dimmers and switches | Wiser switches and dimmers by Schneider |
| Eurotronic Spirit Thermostat | Radiator Thermostat |
| GE Bulbs | |
| GE Tapt Wall Switch | On/Off Switch |

View File

@ -271,7 +271,7 @@ The following devices have been tested by openHAB users with the binding. This l
| Busch-Jaeger 6735 | Control Element (1-channel) |
| Busch-Jaeger 6735/01 | Control Element (1-channel, battery-operated) |
| Busch-Jaeger 6736 | Control Element (2-channel) |
| Clipsal Iconic dimmers and swtiches | Switches and dimmers |
| Clipsal Iconic dimmers and switches | Wiser switches and dimmers by Schneider |
| Eurotronic Spirit Thermostat | Radiator Thermostat |
| GE Bulbs | |
| GE Tapt Wall Switch | On/Off Switch |

View File

@ -48,6 +48,12 @@
<label>Group ID</label>
<description>Address of the group in the DALI bus</description>
</parameter>
<parameter name="readDeviceTargetId" type="integer" required="false" min="0" max="63">
<label>Read Device ID</label>
<description>
If reading values from this group fails, you can choose to read from a single device instead.
</description>
</parameter>
</config-description>
</thing-type>
@ -78,4 +84,53 @@
</config-description>
</thing-type>
<!-- Single DT8 Device Type -->
<thing-type id="device-dt8">
<supported-bridge-type-refs>
<bridge-type-ref id="daliserver"/>
</supported-bridge-type-refs>
<label>DALI DT8 Device</label>
<description>Controls a single DT8 device/ballast</description>
<channels>
<channel id="dimAtFadeRate" typeId="system.brightness"/>
<channel id="dimImmediately" typeId="system.brightness"/>
<channel id="color" typeId="system.color"/>
<channel id="color-temperature-abs" typeId="system.color-temperature-abs"/>
</channels>
<config-description>
<parameter name="targetId" type="integer" required="true" min="0" max="63">
<label>Device ID</label>
<description>Address of the device in the DALI bus</description>
</parameter>
</config-description>
</thing-type>
<!-- Group DT8 Device Type -->
<thing-type id="group-dt8">
<supported-bridge-type-refs>
<bridge-type-ref id="daliserver"/>
</supported-bridge-type-refs>
<label>DALI DT8 Group</label>
<description>Controls a DT8 group of devices/ballasts</description>
<channels>
<channel id="dimAtFadeRate" typeId="system.brightness"/>
<channel id="dimImmediately" typeId="system.brightness"/>
<channel id="color" typeId="system.color"/>
<channel id="color-temperature-abs" typeId="system.color-temperature-abs"/>
</channels>
<config-description>
<parameter name="targetId" type="integer" required="true" min="0" max="31">
<label>Group ID</label>
<description>Address of the group in the DALI bus</description>
</parameter>
<parameter name="readDeviceTargetId" type="integer" required="false" min="0" max="63">
<label>Read Device ID</label>
<description>
If reading values from this group fails, you can choose to read from a single device instead.
</description>
</parameter>
</config-description>
</thing-type>
</thing:thing-descriptions>

View File

@ -10,14 +10,10 @@
<description>The Gardena smart system account</description>
<config-description>
<parameter name="email" type="text" required="true">
<label>Email</label>
<description>Email address for logging in to Gardena smart system</description>
</parameter>
<parameter name="password" type="text" required="true">
<label>Password</label>
<parameter name="apiSecret" type="text" required="true">
<label>API Secret</label>
<context>password</context>
<description>Password for logging in to Gardena smart system</description>
<description>The Gardena smart system integration API secret</description>
</parameter>
<parameter name="apiKey" type="text" required="true">
<label>API Key</label>