Updated external content (Jenkins build 38)

pull/1325/head
openHAB Build Server 2020-10-15 02:10:55 +00:00
parent 32b8867e51
commit 0daf52881f
11 changed files with 122 additions and 54 deletions

File diff suppressed because one or more lines are too long

View File

@ -25,7 +25,25 @@ The binding integrates AVM FRITZ!Boxes with a special focus on the AHA ([AVM Hom
FRITZ!Boxes (thing type `fritzbox`) are supported as bridges and they offer channels for call monitoring.
To activate the call monitor interface on a FRITZ!Box, you need to dial once `#96*5*` on a connected telephone.
You should hear a short audio signal as confirmation.
This procedure opens TCP/IP port 1012 on your FRITZ!Box.
(It can be deactivated again by dialing `#96*4*`.)
You can test if everything is working with the Telnet program from your openHAB server:
```
telnet fritz.box 1012
```
If you see an output like this:
```
Trying 192.168.178.1...
Connected to fritz.box.
Escape character is '^]'.
```
then it successfully connected to the call monitor.
If not, please make sure that the target openHAB system does not block the port on its firewall.
Additionally, they serve as a bridge for accessing other AHA devices.
For AHA functionality, the router has to run at least on firmware FRITZ!OS 6.00 and it has to support the "Smart Home" service.
@ -76,11 +94,11 @@ Beside four customizable buttons the FRITZ!DECT 440 supports temperature reading
The following sensors have been successfully tested using FRITZ!OS 7 for FRITZ!Box 7490 / 7590:
- [SmartHome Tür-/Fensterkontakt (optisch)](https://www.smarthome.de/geraete/eurotronic-smarthome-tuer-fensterkontakt-optisch) - an optical door/window contact
- [SmartHome Tür-/Fensterkontakt (magnetisch)](https://www.smarthome.de/geraete/smarthome-tuer-fensterkontakt-magnetisch-weiss) - a magnetic door/window contact
- [SmartHome Bewegungsmelder](https://www.smarthome.de/geraete/telekom-smarthome-bewegungsmelder-innen) - a motion sensor
- [SmartHome Rauchmelder](https://www.smarthome.de/geraete/smarthome-rauchmelder-weiss) - a smoke detector
- [SmartHome Wandtaster](https://www.smarthome.de/geraete/telekom-smarthome-wandtaster) - a switch with two buttons
- [SmartHome Tür-/Fensterkontakt (optisch)](https://www.smarthome.de/geraete/eurotronic-smarthome-tuer-fensterkontakt-optisch) - an optical door/window contact (thing type `HAN_FUN_CONTACT`)
- [SmartHome Tür-/Fensterkontakt (magnetisch)](https://www.smarthome.de/geraete/smarthome-tuer-fensterkontakt-magnetisch-weiss) - a magnetic door/window contact (thing type `HAN_FUN_CONTACT`)
- [SmartHome Bewegungsmelder](https://www.smarthome.de/geraete/telekom-smarthome-bewegungsmelder-innen) - a motion sensor (thing type `HAN_FUN_CONTACT`)
- [SmartHome Rauchmelder](https://www.smarthome.de/geraete/smarthome-rauchmelder-weiss) - a smoke detector (thing type `HAN_FUN_CONTACT`)
- [SmartHome Wandtaster](https://www.smarthome.de/geraete/telekom-smarthome-wandtaster) - a switch with two buttons (thing type `HAN_FUN_SWITCH`)
The use of other Sensors should be possible, if these are compatible with DECT-ULE / HAN-FUN standards.

View File

@ -1,7 +1,7 @@
---
id: dwdpollenflug
label: DWDPollenflug
title: DWDPollenflug - Bindings
label: DWD Pollenflug
title: DWD Pollenflug - Bindings
type: binding
description: "The 'Deutsche Wetterdienst' (DWD) reports the current pollen count index for Germany on a daily base and a forecast for tomorrow and the day after tomorrow."
since: 3x
@ -12,7 +12,7 @@ install: auto
{% include base.html %}
# DWDPollenflug Binding
# DWD Pollenflug Binding
The "Deutsche Wetterdienst" (DWD) reports the current pollen count index for Germany on a daily base and a forecast for tomorrow and the day after tomorrow.
This binding allows you to retrieve this data for your region or partregion. You can find a map of the data here:

View File

@ -1,7 +1,7 @@
---
id: dwdunwetter
label: DwdUnwetter
title: DwdUnwetter - Bindings
label: DWD Unwetter
title: DWD Unwetter - Bindings
type: binding
description: "Binding to retrieve the Weather Warnings of the 'Deutscher Wetterdienstes' from the [DWD Geoserver](https://maps.dwd.de/geoserver/web/)."
since: 3x
@ -12,7 +12,7 @@ install: auto
{% include base.html %}
# DwdUnwetter Binding
# DWD Unwetter Binding
Binding to retrieve the Weather Warnings of the "Deutscher Wetterdienstes" from the [DWD Geoserver](https://maps.dwd.de/geoserver/web/).
The DWD provides weather warnings for Germany.

View File

@ -24,8 +24,8 @@ The integration happens through the Hue bridge, which acts as an IP gateway to t
The Hue bridge is required as a "bridge" for accessing any other Hue device.
It supports the ZigBee LightLink protocol as well as the upwards compatible ZigBee 3.0 protocol.
There are two types of Hue bridges, generally refered to as v1 (the rounded version) and v2 (the squared version).
Only noticable difference between the two generation of bridges is the added support for Apple HomeKit in v2.
There are two types of Hue bridges, generally referred to as v1 (the rounded version) and v2 (the squared version).
Only noticeable difference between the two generation of bridges is the added support for Apple HomeKit in v2.
Both bridges are fully supported by this binding.
Almost all available Hue devices are supported by this binding.
@ -67,19 +67,20 @@ The Hue Motion Sensor registers a `ZLLLightLevel` sensor (0106), a `ZLLPresence`
The Hue CLIP Sensor saves scene states with status or flag for HUE rules.
They are presented by the following ZigBee Device ID and _Thing type_:
| Device type | ZigBee Device ID | Thing type |
|-----------------------------|------------------|------------|
| Light Sensor | 0x0106 | 0106 |
| Occupancy Sensor | 0x0107 | 0107 |
| Temperature Sensor | 0x0302 | 0302 |
| Non-Colour Controller | 0x0820 | 0820 |
| Non-Colour Scene Controller | 0x0830 | 0830 |
| CLIP Generic Status Sensor | 0x0840 | 0840 |
| CLIP Generic Flag Sensor | 0x0850 | 0850 |
| Device type | ZigBee Device ID | Thing type |
|-----------------------------|------------------|----------------|
| Light Sensor | 0x0106 | 0106 |
| Occupancy Sensor | 0x0107 | 0107 |
| Temperature Sensor | 0x0302 | 0302 |
| Non-Colour Controller | 0x0820 | 0820 |
| Non-Colour Scene Controller | 0x0830 | 0830 |
| CLIP Generic Status Sensor | 0x0840 | 0840 |
| CLIP Generic Flag Sensor | 0x0850 | 0850 |
| Geofence Sensor | | geofencesensor |
The Hue Dimmer Switch has 4 buttons and registers as a Non-Colour Controller switch, while the Hue Tap (also 4 buttons) registers as a Non-Colour Scene Controller in accordance with the ZLL standard.
Also, Hue bridge support CLIP Generic Status Sensor and CLIP Generic Flag Sensor. These sensors save state for rules and calculate what actions to do. CLIP Sensor set or get by json through IP.
Also, Hue bridge support CLIP Generic Status Sensor and CLIP Generic Flag Sensor. These sensors save state for rules and calculate what actions to do. CLIP Sensor set or get by JSON through IP.
The type of a specific device can be found in the configuration section for things in the PaperUI.
It is part of the unique thing id which could look like:
@ -249,14 +250,14 @@ The `tap_switch_event` can trigger one of the following events:
This binding includes a rule action, which allows to change a light channel with a specific fading time from within rules.
There is a separate instance for each light, which can be retrieved e.g. through
```
```php
val hueActions = getActions("hue","hue:0210:00178810d0dc:1")
```
where the first parameter always has to be `hue` and the second is the full Thing UID of the light that should be used.
Once this action instance is retrieved, you can invoke the `fadingLightCommand(String channel, Command command, DecimalType fadeTime)` method on it:
```
```php
hueActions.fadingLightCommand("color", new PercentType(100), new DecimalType(1000))
```
@ -381,7 +382,7 @@ If ommited the rule gets triggered by any key action and you can determine the e
Be aware that the events have a '.0' attached to them, like `2001.0` or `34.0`.
So, testing for specific events looks like this:
```
```php
if (receivedEvent.getEvent() == "1000.0")) {
//do stuff
}

View File

@ -325,6 +325,7 @@ or in case of unknown models include the model information e.g.:
| Yeelight yilai ceiling | miio:basic | [yilai.light.ceiling1](#yilai-light-ceiling1) | Yes | |
| Yeelight yilai ceiling | miio:basic | [yilai.light.ceiling2](#yilai-light-ceiling2) | Yes | |
| Yeelight yilai ceiling | miio:basic | [yilai.light.ceiling3](#yilai-light-ceiling3) | Yes | |
| Zhimi Heater | miio:basic | [zhimi.heater.za1](#zhimi-heater-za1) | Yes | Experimental support. Please report back if all channels are functional. Preferably share the debug log of property refresh and command responses |
# Advanced: Unsupported devices
@ -3035,6 +3036,20 @@ e.g. `smarthome:send actionCommand 'upd_timer["1498595904821", "on"]'` would ena
| customScene | String | Set Scene | |
| nightlightBrightness | Number | Nightlight Brightness | |
### Zhimi Heater (<a name="zhimi-heater-za1">zhimi.heater.za1</a>) Channels
| Channel | Type | Description | Comment |
|------------------|---------|-------------------------------------|------------|
| power | Switch | Power | |
| target_temperature | Number | Target Temperature | |
| brightness | Number | Brightness | |
| buzzer | Switch | Buzzer Status | |
| relative_humidity | Number | Relative Humidity | |
| childlock | Switch | Child Lock | |
| HWSwitch | Switch | HW Switch | |
| temperature | Number | Temperature | |
| usedhours | Number | Run Time | |
@ -6274,4 +6289,21 @@ String customScene "Set Scene" (G_light) {channel="miio:basic:light:customScene"
Number nightlightBrightness "Nightlight Brightness" (G_light) {channel="miio:basic:light:nightlightBrightness"}
```
### Zhimi Heater (zhimi.heater.za1) item file lines
note: Autogenerated example. Replace the id (heater) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.
```java
Group G_heater "Zhimi Heater" <status>
Switch power "Power" (G_heater) {channel="miio:basic:heater:power"}
Number target_temperature "Target Temperature" (G_heater) {channel="miio:basic:heater:target_temperature"}
Number brightness "Brightness" (G_heater) {channel="miio:basic:heater:brightness"}
Switch buzzer "Buzzer Status" (G_heater) {channel="miio:basic:heater:buzzer"}
Number relative_humidity "Relative Humidity" (G_heater) {channel="miio:basic:heater:relative_humidity"}
Switch childlock "Child Lock" (G_heater) {channel="miio:basic:heater:childlock"}
Switch HWSwitch "HW Switch" (G_heater) {channel="miio:basic:heater:HWSwitch"}
Number temperature "Temperature" (G_heater) {channel="miio:basic:heater:temperature"}
Number usedhours "Run Time" (G_heater) {channel="miio:basic:heater:usedhours"}
```

View File

@ -275,7 +275,7 @@ Here are a few examples:
* Apply a prefix: "myprefix%s"
* Apply a suffix: "%s suffix"
* Number precision: ".4f" for a 4 digit precision. Use the "+" flag to always add a sign: "+.4f".
* Decimal to Hexadecimal/Octal/Scientific: For example "60" with "%x", "%o", "%e" becomes "74", "3C", "60".
* Decimal to Hexadecimal/Octal/Scientific: For example "60" with "%x", "%o", "%e" becomes "3C", "74", "60".
* Date/Time: To reference the item state multiple times, use "%1$". Use the "tX" conversion where "X" can be any of [h,H,m,M,I,k,l,S,p,B,b,A,a,y,Y,d,e].
- For an output of *May 23, 1995* use "%1$**tb** %1$**te**,%1$**tY**".
- For an output of *23.05.1995* use "%1$**td**.%1$**tm**.%1$**tY**".

View File

@ -14,7 +14,9 @@
<channel id="co2" typeId="Co2"/>
<channel id="humidity" typeId="Humidity"/>
<channel id="aqi" typeId="Aqi"/>
<channel id="pm_01" typeId="Pm_01"/>
<channel id="pm_25" typeId="Pm_25"/>
<channel id="pm_10" typeId="Pm_10"/>
<channel id="temperature" typeId="Temperature"/>
<channel id="timestamp" typeId="Timestamp"/>
<channel id="used_memory" typeId="Used_memory"/>
@ -90,6 +92,20 @@
<state readOnly="true" pattern="%.1f %unit%"/>
</channel-type>
<channel-type id="Pm_10">
<item-type>Number:Density</item-type>
<label>PM10</label>
<description>PM10 level, µg/m&#179;(Only in Pro version)</description>
<state readOnly="true" pattern="%.1f %unit%"/>
</channel-type>
<channel-type id="Pm_01">
<item-type>Number:Density</item-type>
<label>PM0.1</label>
<description>PM0.1 level, µg/m&#179;(Only in Pro version)</description>
<state readOnly="true" pattern="%.1f %unit%"/>
</channel-type>
<channel-type id="Temperature">
<item-type>Number:Temperature</item-type>
<label>Temperature</label>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<thing:thing-descriptions bindingId="hue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
<!-- Geofence Sensor -->
<thing-type id="geofencesensor">
<supported-bridge-type-refs>
<bridge-type-ref id="bridge"/>
</supported-bridge-type-refs>
<label>Geofence Sensor</label>
<description>A sensor providing geofence based presence detection.</description>
<channels>
<channel id="presence" typeId="system.motion"/>
<channel id="last_updated" typeId="last_updated"/>
</channels>
<representation-property>uniqueId</representation-property>
<config-description-ref uri="thing-type:hue:geofencesensor"/>
</thing-type>
</thing:thing-descriptions>

View File

@ -9,7 +9,7 @@
<bridge-type-ref id="bridge"/>
</supported-bridge-type-refs>
<label>Hue Presence Sensor</label>
<label>Presence Sensor</label>
<description>A motion sensor providing presence detection.</description>
<channels>
@ -21,29 +21,6 @@
<representation-property>uniqueId</representation-property>
<config-description>
<parameter name="sensorId" type="text">
<label>Sensor ID</label>
<description>The identifier that is used within the hue bridge.</description>
<required>true</required>
</parameter>
<parameter name="on" type="boolean">
<label>Sensor Status</label>
<description>Enables or disables the sensor.</description>
</parameter>
<parameter name="ledindication" type="boolean">
<label>LED Indication</label>
<description>Turns device LED during normal operation on or off. Devices might still indicate exceptional operation
(Reset, SW Update, Battery Low).</description>
</parameter>
<parameter name="sensitivity" type="integer" min="0" step="1">
<label>Sensitivity</label>
<description>The current sensitivity of the presence sensor. Cannot exceed maximum sensitivity.</description>
</parameter>
<parameter name="sensitivitymax" type="integer" readOnly="true">
<label>Maximum Sensitivity</label>
<description>The maximum sensitivity of the presence sensor.</description>
</parameter>
</config-description>
<config-description-ref uri="thing-type:hue:presencesensor"/>
</thing-type>
</thing:thing-descriptions>

View File

@ -120,6 +120,6 @@
<item-type>Number:Time</item-type>
<label>Next Open Duration</label>
<description>The duration the station will be opened the next time it is switched on.</description>
<state readOnly="false" pattern="%.0f s"/>
<state readOnly="false" pattern="%.0f min"/>
</channel-type>
</thing:thing-descriptions>