Updated external content (Jenkins build 1839)

pull/2219/head
openHAB Build Server 2023-12-16 15:44:43 +00:00
parent 0b8abff912
commit 0f4c57c895
6 changed files with 39 additions and 53 deletions

View File

@ -46,8 +46,8 @@ MainType: 3
3.008: DPT_Control_Blinds values: 0 = up 1 = down
MainType: 4
4.001: DPT_Char_ASCII
4.002: DPT_Char_8859_1
unsupported 4.001: DPT_Char_ASCII
unsupported 4.002: DPT_Char_8859_1
MainType: 5
5.000: General byte

View File

@ -46,6 +46,20 @@ There is an _ip_ bridge to connect to KNX IP Gateways, and a _serial_ bridge for
The following two bridge types are supported.
Bridges don't have channels on their own.
### Discovery
KNX IP bridges, i.e. IP interfaces, routers, and knxd instances, are discovered through mulitcast communication in the local network.
As a KNX setup is typically static, this in only done during startup of the binding.
Corresponding bridges are added to the inbox.
Additional configuration might be necessary after adding a bridge.
Note that several items per device might be created, as routers typically support routing and tunneling.
Make sure you import only one item per device.
Discovery is not available for serial bridges and device Things described below.
Discovery of IP bridges will not work without further measures if openHAB and the interface run on different network segments,
as multicast traffic is typically not forwarded.
### IP Gateway
The IP Gateway is the most commonly used way to connect to the KNX bus. At its base, the _ip_ bridge accepts the following configuration parameters:

View File

@ -132,9 +132,10 @@ Note that the group 0 (or ALL group) is not auto discovered as a thing and thus
| Channel | Type | Description |
|-|-|-|
| `level` | Dimmer | Level changes the brightness of the globe. |
| `level` | Dimmer | Level changes the brightness of the globe. Not present if the bulb supports the `colour` channel. |
| `colourTemperature` | Dimmer | Change from cool to warm white with this control. |
| `colour` | Color | Allows you to change the colour, brightness and saturation of the globe. |
| `colourTemperatureAbs` | Number:Temperature | Colour temperature in mireds. |
| `colour` | Color | Allows you to change the colour, brightness and saturation of the globe. Can also be linked directly with a Dimmer item if you happen to have a bulb that doesn't support colour, but is controlled by a remote that normally does support colour. |
| `discoMode` | String | Switch to a Disco mode directly from a drop down list. |
| `bulbMode` | String (read only) | Displays the mode the bulb is currently in so that rules can determine if the globe is white, a color, disco modes or night mode are selected. |
| `command` | String | Sends the raw commands that the buttons on a remote send. |
@ -206,8 +207,9 @@ Thing mqtt:rgb_cct:myBroker:0xE6C4 "Hallway" (mqtt:broker:myBroker) @ "MQTT"
*.items
```java
Dimmer Hallway_Level "Front Hall" {channel="mqtt:rgb_cct:myBroker:0xE6C4:level"}
Dimmer Hallway_Level "Front Hall" {channel="mqtt:rgb_cct:myBroker:0xE6C4:colour"}
Dimmer Hallway_ColourTemperature "White Color Temp" {channel="mqtt:rgb_cct:myBroker:0xE6C4:colourTemperature"}
Number:Temperature Hallway_ColourTemperatureK "White Color Temp [%d %unit%]" {channel="mqtt:rgb_cct:myBroker:0xE6C4:colourTemperatureAbs", unit="K"}
Color Hallway_Colour "Front Hall" ["Lighting"] {channel="mqtt:rgb_cct:myBroker:0xE6C4:colour"}
String Hallway_DiscoMode "Disco Mode" {channel="mqtt:rgb_cct:myBroker:0xE6C4:discoMode"}
String Hallway_BulbCommand "Send Command" {channel="mqtt:rgb_cct:myBroker:0xE6C4:command"}

View File

@ -124,5 +124,6 @@ Frame label="Neato BotVac Connected" {
### neato.things
```java
neato:vacuumcleaner:fanndamm [ serial="vacuumcleaner-serial", secret="secret-string"]
Bridge neato:neatoaccount:neatobridge "Neato Account Bridge" [ email="yours@example.com", password="neato-account-password" ]
Thing neato:vacuumcleaner:fanndamm "Neato BotVac" (neato:neatoaccount:neatobridge) [ serial="vacuumcleaner-serial", secret="secret-string" ]
```

View File

@ -8,6 +8,8 @@
<label>KNX/IP Gateway</label>
<description>This is a KNX IP interface or router</description>
<representation-property>serialNumber</representation-property>
<config-description>
<parameter-group name="knxsecure">
<label>KNX secure</label>

View File

@ -12,9 +12,9 @@
<description>LED globe with full Colour, and both cool and warm whites.</description>
<category>Lightbulb</category>
<channels>
<channel id="level" typeId="level"/>
<channel id="colourTemperature" typeId="colourTemperature"/>
<channel id="colour" typeId="colour"/>
<channel id="colourTemperature" typeId="system.color-temperature"/>
<channel id="colourTemperatureAbs" typeId="system.color-temperature-abs"/>
<channel id="colour" typeId="system.color"/>
<channel id="discoMode" typeId="discoMode"/>
<channel id="bulbMode" typeId="bulbMode"/>
<channel id="command" typeId="command"/>
@ -30,9 +30,9 @@
<description>Use this when your remote is the newer 8 group type called FUT089 and your globes are rgb_cct</description>
<category>Lightbulb</category>
<channels>
<channel id="level" typeId="level"/>
<channel id="colourTemperature" typeId="colourTemperature"/>
<channel id="colour" typeId="colour"/>
<channel id="colourTemperature" typeId="system.color-temperature"/>
<channel id="colourTemperatureAbs" typeId="system.color-temperature-abs"/>
<channel id="colour" typeId="system.color"/>
<channel id="discoMode" typeId="discoMode"/>
<channel id="bulbMode" typeId="bulbMode"/>
<channel id="command" typeId="command"/>
@ -48,8 +48,9 @@
<description>Use this when your remote is the newer fut091 and your globes are cct</description>
<category>Lightbulb</category>
<channels>
<channel id="level" typeId="level"/>
<channel id="colourTemperature" typeId="colourTemperature"/>
<channel id="level" typeId="system.brightness"/>
<channel id="colourTemperature" typeId="system.color-temperature"/>
<channel id="colourTemperatureAbs" typeId="system.color-temperature-abs"/>
<channel id="command" typeId="command"/>
</channels>
<config-description-ref uri="thing-type:mqtt:cct"/>
@ -63,8 +64,9 @@
<description>LED globe with both cool and warm white controls</description>
<category>Lightbulb</category>
<channels>
<channel id="level" typeId="level"/>
<channel id="colourTemperature" typeId="colourTemperature"/>
<channel id="level" typeId="system.brightness"/>
<channel id="colourTemperature" typeId="system.color-temperature"/>
<channel id="colourTemperatureAbs" typeId="system.color-temperature-abs"/>
<channel id="command" typeId="command"/>
</channels>
<config-description-ref uri="thing-type:mqtt:cct"/>
@ -78,8 +80,7 @@
<description>RGB Globe with a fixed white</description>
<category>Lightbulb</category>
<channels>
<channel id="level" typeId="level"/>
<channel id="colour" typeId="colour"/>
<channel id="colour" typeId="system.color"/>
<channel id="discoMode" typeId="discoMode"/>
<channel id="bulbMode" typeId="bulbMode"/>
<channel id="command" typeId="command"/>
@ -95,8 +96,7 @@
<description>RGB Globe with no white</description>
<category>Lightbulb</category>
<channels>
<channel id="level" typeId="level"/>
<channel id="colour" typeId="colour"/>
<channel id="colour" typeId="system.color"/>
<channel id="discoMode" typeId="discoMode"/>
<channel id="bulbMode" typeId="bulbMode"/>
<channel id="command" typeId="command"/>
@ -104,39 +104,6 @@
<config-description-ref uri="thing-type:mqtt:rgb"/>
</thing-type>
<channel-type id="level">
<item-type>Dimmer</item-type>
<label>Level</label>
<description>Level changes the brightness of the globe.</description>
<category>Slider</category>
<tags>
<tag>Control</tag>
<tag>Light</tag>
</tags>
</channel-type>
<channel-type id="colourTemperature">
<item-type>Dimmer</item-type>
<label>Colour Temperature</label>
<description>Change from cool to warm white with this control.</description>
<category>Slider</category>
<tags>
<tag>Control</tag>
<tag>ColorTemperature</tag>
</tags>
</channel-type>
<channel-type id="colour">
<item-type>Color</item-type>
<label>Colour</label>
<description>Allows you to change the colour, brightness and saturation of the globe.</description>
<category>ColorLight</category>
<tags>
<tag>Control</tag>
<tag>Light</tag>
</tags>
</channel-type>
<channel-type id="command" advanced="true">
<item-type>String</item-type>
<label>Command</label>