From 2b4212d91857a6629f6d3879c749351e0bad01ff Mon Sep 17 00:00:00 2001 From: openHAB Build Server Date: Sun, 26 Dec 2021 22:23:59 +0000 Subject: [PATCH] Updated external content (Jenkins build 698) --- _addons_bindings/ecotouch/readme.md | 23 +++++++++++++++++-- .../org.openhab.binding.zigbee/README.md | 6 ++--- _addons_bindings/zigbee/readme.md | 6 ++--- _addons_ios/alexa-skill/readme.md | 6 ++--- .../resources/OH-INF/thing/thing-types.xml | 4 ++-- 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/_addons_bindings/ecotouch/readme.md b/_addons_bindings/ecotouch/readme.md index d611c26cf..4c1c2c2da 100644 --- a/_addons_bindings/ecotouch/readme.md +++ b/_addons_bindings/ecotouch/readme.md @@ -79,7 +79,7 @@ Advanced channels: | Channel ID | Type | Read-Only | Description | |----------------------------------|----------------------|-----------|-------------------------------------------------------------------------| | compressor_power | Number:Dimensionless | yes | Percent Power Compressor | -| coolEnableTemp | Number:Temperature | yes | Temperature Cooling Enable | +| coolEnableTemp | Number:Temperature | no | Temperature Cooling Enable | | date_day | Number:Dimensionless | yes | Day | | date_month | Number:Dimensionless | yes | Month | | date_year | Number:Dimensionless | yes | Year | @@ -100,7 +100,7 @@ Advanced channels: | maxVLTemp | Number:Temperature | yes | maxVLTemp | | nviHeizkreisNorm | Number:Temperature | no | nviHeizkreisNorm | | nviNormAussen | Number:Temperature | no | nviNormAussen | -| nviSollKuehlen | Number:Temperature | yes | nviSollKuehlen | +| nviSollKuehlen | Number:Temperature | no | nviSollKuehlen | | nviTHeizgrenze | Number:Temperature | no | nviTHeizgrenze | | nviTHeizgrenzeSoll | Number:Temperature | no | nviTHeizgrenze Setpoint | | operating_hours_circulation_pump | Number:Time | yes | Operating Hours Circulation Pump | @@ -194,6 +194,7 @@ Number:Power HeatPump_power_el { channel="ecotouch:geo:heatpump:pow Number:Power HeatPump_power_th { channel="ecotouch:geo:heatpump:power_heating" } Number HeatPump_COP_heating { channel="ecotouch:geo:heatpump:cop_heating" } Number:Temperature HeatPump_adaptHeating { channel="ecotouch:geo:heatpump:adapt_heating" } +Switch HeatPump_state_sourcepump { channel="ecotouch:geo:heatpump:state_sourcepump" } ``` ### ecotouch.sitemap @@ -213,3 +214,21 @@ sitemap ecotouch label="Waterkotte EcoTouch" Setpoint item=HeatPump_adaptHeating minValue=-2.0 maxValue=2.0 step=0.5 } ``` + +A snippet to show the current state of the heatpump (you need to have the corresponding items in your .items-file): + +``` + Text label="State" icon="settings" { + Text item=HeatPump_state_sourcepump label="State Source Pump [%s]" valuecolor=[==ON="green", ==OFF="red"] + Text item=HeatPump_state_heatingpump label="State Heating Pump [%s]" valuecolor=[==ON="green", ==OFF="red"] + Text item=HeatPump_state_evd label="State EVD [%s]" valuecolor=[==ON="green", ==OFF="red"] + Text item=HeatPump_state_compressor1 label="State Compressor 1 [%s]" valuecolor=[==ON="green", ==OFF="red"] + Text item=HeatPump_state_extheater label="State External Heater [%s]" valuecolor=[==ON="green", ==OFF="red"] + Text item=HeatPump_state_alarm label="State Alarm [%s]" valuecolor=[==ON="green", ==OFF="red"] + Text item=HeatPump_state_cooling label="State Cooling [%s]" valuecolor=[==ON="green", ==OFF="red"] + Text item=HeatPump_state_water label="State Water [%s]" valuecolor=[==ON="green", ==OFF="red"] + Text item=HeatPump_state_pool label="State Pool [%s]" valuecolor=[==ON="green", ==OFF="red"] + Text item=HeatPump_state_solar label="State Solar [%s]" valuecolor=[==ON="green", ==OFF="red"] + Text item=HeatPump_state_cooling4way label="State Cooling4Way [%s]" valuecolor=[==ON="green", ==OFF="red"] + } +``` diff --git a/_addons_bindings/zigbee/org.openhab.binding.zigbee/README.md b/_addons_bindings/zigbee/org.openhab.binding.zigbee/README.md index 91bf7d564..4c59a934f 100644 --- a/_addons_bindings/zigbee/org.openhab.binding.zigbee/README.md +++ b/_addons_bindings/zigbee/org.openhab.binding.zigbee/README.md @@ -141,7 +141,7 @@ Sets the Trust Centre join/rejoin mode. | `TC_JOIN_INSECURE` | Allow all joins. | | | `TC_JOIN_INSTALLCODE` | Only join with install code. | Devices attempting to join with the TC Link Key will be rejected. | -##### Group Registration (zigbee_groupregistration) +##### Group Registration (zigbee_groupregistration) Some devices send commands to a group address (ie using multicast addressing). This configuration allows the user to define a list of groups that the binding will listen for commands. Multiple groups can be defined - groups are separated with a comma and must be defined as a four character hexadecimal value. @@ -480,7 +480,7 @@ This will log data into the standard `openhab.log` file. There is an [online log Note that logs can only show what is happening at a high level - it can't show all data exchanges between the device and the coordinator - just what the coordinator sends to the binding. For this reason it can be difficult to debug issues where devices are not joining the network, or other low level issues need resolving. In such cases a network sniffer log is required, which requires additional hardware and software. Information and software required to use an Ember dongle as a sniffer can be found on the [OpenSmartHouse](https://opensmarthouse.org/blog/zigbee_network_sniffer) site. -### ZigBee Console Commands +### ZigBee Console Commands The openHAB command line interface provides a number of commands to interact with the ZigBee framework. These can provide useful options for debugging when things aren't going as planned, and can also provide advanced users a means to make changes that are not possible directly through the binding. This section will provide information on a few common issues that users may come up against, but is not an exhaustive user manual for low level ZigBee commands. @@ -492,7 +492,7 @@ To list all known nodes, use the `nodes` command. This will list the nodes and e In some instances a device may not work correctly. This could be because the binding had problems during initialisation, or possibly because the device supports features not implemented in the binding, or possibly the device may implement custom functionality. To understand this, there is a `fingerprint` command. This command will attempt to poll the device to get a list of all the commands and attributes that the device supports and create a concise list. Note that this may not work on all devices if the device doesn't support the functionality discovery commands. -#### Binding and Reporting +#### Binding and Reporting The binding table is used within ZigBee to configure devices to send reports to the binding when their state changes. The binding will attempt to set the required ZigBee bindings during device initialisation, but sometimes this can fail. Often this may occur on older devices that have limited memory, and only have a small number of entries in the binding table, and then manual manipulation of the table may be required. diff --git a/_addons_bindings/zigbee/readme.md b/_addons_bindings/zigbee/readme.md index 6a007111d..903707b6c 100644 --- a/_addons_bindings/zigbee/readme.md +++ b/_addons_bindings/zigbee/readme.md @@ -156,7 +156,7 @@ Sets the Trust Centre join/rejoin mode. | `TC_JOIN_INSECURE` | Allow all joins. | | | `TC_JOIN_INSTALLCODE` | Only join with install code. | Devices attempting to join with the TC Link Key will be rejected. | -##### Group Registration (zigbee_groupregistration) +##### Group Registration (zigbee_groupregistration) Some devices send commands to a group address (ie using multicast addressing). This configuration allows the user to define a list of groups that the binding will listen for commands. Multiple groups can be defined - groups are separated with a comma and must be defined as a four character hexadecimal value. @@ -495,7 +495,7 @@ This will log data into the standard `openhab.log` file. There is an [online log Note that logs can only show what is happening at a high level - it can't show all data exchanges between the device and the coordinator - just what the coordinator sends to the binding. For this reason it can be difficult to debug issues where devices are not joining the network, or other low level issues need resolving. In such cases a network sniffer log is required, which requires additional hardware and software. Information and software required to use an Ember dongle as a sniffer can be found on the [OpenSmartHouse](https://opensmarthouse.org/blog/zigbee_network_sniffer) site. -### ZigBee Console Commands +### ZigBee Console Commands The openHAB command line interface provides a number of commands to interact with the ZigBee framework. These can provide useful options for debugging when things aren't going as planned, and can also provide advanced users a means to make changes that are not possible directly through the binding. This section will provide information on a few common issues that users may come up against, but is not an exhaustive user manual for low level ZigBee commands. @@ -507,7 +507,7 @@ To list all known nodes, use the `nodes` command. This will list the nodes and e In some instances a device may not work correctly. This could be because the binding had problems during initialisation, or possibly because the device supports features not implemented in the binding, or possibly the device may implement custom functionality. To understand this, there is a `fingerprint` command. This command will attempt to poll the device to get a list of all the commands and attributes that the device supports and create a concise list. Note that this may not work on all devices if the device doesn't support the functionality discovery commands. -#### Binding and Reporting +#### Binding and Reporting The binding table is used within ZigBee to configure devices to send reports to the binding when their state changes. The binding will attempt to set the required ZigBee bindings during device initialisation, but sometimes this can fail. Often this may occur on older devices that have limited memory, and only have a small number of entries in the binding table, and then manual manipulation of the table may be required. diff --git a/_addons_ios/alexa-skill/readme.md b/_addons_ios/alexa-skill/readme.md index e60407032..575885904 100644 --- a/_addons_ios/alexa-skill/readme.md +++ b/_addons_ios/alexa-skill/readme.md @@ -117,9 +117,9 @@ There is a maximum of 300 endpoints limit per user with 100 capabilities per end ## Single Endpoint -Single items in openHAB can be mapped to single endpoint in Alexa through the use of the [item metadata](https://www.openhab.org/docs/concepts/items.html#item-metadata). +Single items in openHAB can be mapped to a single endpoint in Alexa through the use of the [item metadata](https://www.openhab.org/docs/concepts/items.html#item-metadata). -An simple example of this is a light switch. In openHAB a light switch is defined as a "Switch" item and responds to ON or OFF commands. +A simple example of this is a light switch. In openHAB a light switch is defined as a "Switch" item and responds to ON or OFF commands. ```xtend Switch LightSwitch "Light Switch" {alexa="Light"} @@ -682,7 +682,7 @@ If paired with [`TiltAngle`](#tiltangle), the primary controls (open/close/stop) #### `TiltAngle` -Items that represent the title angle of a window blind. +Items that represent the tilt angle of a window blind. If paired with [`PositionState`](#positionstate), the primary controls (open/close/stop) can be defined as position-based or tilt-based setting metadata parameter `primaryControl="tilt"` at the group level. diff --git a/_thing_types/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml b/_thing_types/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml index 1272f90c8..91ec05504 100644 --- a/_thing_types/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml +++ b/_thing_types/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml @@ -586,13 +586,13 @@ Number:Temperature Temperature - + Number:Temperature Temperature - + Number:Temperature