Merge branch '2.5.x' into StiebelBinding

* 2.5.x: (174 commits) [hpprinter] Add additional data points and refactoring (openhab#7805) [neohub] new/legacy API; null annotations; enhancements; bugs; logging (openhab#7767) [meteoalerte] Initial contribution (openhab#7200) [lgwebos] Console command to show the access key (openhab#7801) [hue] Refactored state handling and fix polling after command (openhab#7518) [telegram] add attachment URL (openhab#7816) [siemensrds] readme adjusted to match openhab#7814 (openhab#7819) [lametrictime] correctly parse response (openhab#7818) [Seneye] Bug fix for using Pond or Home sensors. (openhab#7797) [siemensrds] apply UoM quantityType percent for relative humidity (openhab#7814) [alarmdecoder] Add vzone thing for virtual zone control (openhab#7800) [hue] Channel alert added for groups (openhab#7810) [hue] Keep compatibility with hue emulation for groups (openhab#7809) [dscalarm] Bridge/things management refactored (openhab#7748) [avmfritz] Add link to Fensterkontakt (magnetisch) to docs (openhab#7806) [deconz] add light/blind support and additional sensors (openhab#7608) [homekit] add support for min/max values for temperature (openhab#7782) [tesla] Use CXF JAX-RS client builder, if available (openhab#7804) [mqtt.homie] Improve Homie discovery time (openhab#7760) [siemensrds] null annotations; JUnit; UoM; enhancements; bug; refactoring; logging (openhab#7769) ...
Dries-Vandenneucker · May 31, 2020 · b77c7cd · b77c7cd
2 parents 698c10f + 6319a3b
commit b77c7cd
Show file tree

Hide file tree

Showing 1,300 changed files with 50,071 additions and 16,881 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -34,6 +34,7 @@
 /bundles/org.openhab.binding.coolmasternet/ @projectgus
 /bundles/org.openhab.binding.coronastats/ @DerOetzi
 /bundles/org.openhab.binding.daikin/ @caffineehacker
+/bundles/org.openhab.binding.danfossairunit/ @pravussum
 /bundles/org.openhab.binding.darksky/ @cweitkamp
 /bundles/org.openhab.binding.deconz/ @davidgraeff
 /bundles/org.openhab.binding.denonmarantz/ @jwveldhuis
@@ -48,6 +49,8 @@
 /bundles/org.openhab.binding.dwdpollenflug/ @DerOetzi
 /bundles/org.openhab.binding.dwdunwetter/ @limdul79
 /bundles/org.openhab.binding.elerotransmitterstick/ @vbier
+/bundles/org.openhab.binding.energenie/ @hmerk
+/bundles/org.openhab.binding.enigma2/ @gdolfen
 /bundles/org.openhab.binding.enocean/ @fruggy83
 /bundles/org.openhab.binding.enturno/ @klocsson
 /bundles/org.openhab.binding.etherrain/ @dfad1469
@@ -106,6 +109,7 @@
 /bundles/org.openhab.binding.max/ @marcelrv
 /bundles/org.openhab.binding.mcp23017/ @aogorek
 /bundles/org.openhab.binding.melcloud/ @lucacalcaterra @paulianttila @thewiep
+/bundles/org.openhab.binding.meteoalerte/ @clinique
 /bundles/org.openhab.binding.meteoblue/ @9037568
 /bundles/org.openhab.binding.meteostick/ @cdjackson
 /bundles/org.openhab.binding.miele/ @kgoderis
@@ -141,6 +145,7 @@
 /bundles/org.openhab.binding.onkyo/ @pail23 @paulianttila
 /bundles/org.openhab.binding.opengarage/ @psmedley
 /bundles/org.openhab.binding.opensprinkler/ @CrackerStealth @FlorianSW
+/bundles/org.openhab.binding.openthermgateway/ @ArjenKorevaar
 /bundles/org.openhab.binding.openuv/ @clinique
 /bundles/org.openhab.binding.openweathermap/ @cweitkamp
 /bundles/org.openhab.binding.orvibo/ @tavalin
@@ -179,6 +184,7 @@
 /bundles/org.openhab.binding.snmp/ @J-N-K
 /bundles/org.openhab.binding.solaredge/ @alexf2015
 /bundles/org.openhab.binding.solarlog/ @johannrichard
+/bundles/org.openhab.binding.somfymylink/ @loungeflyz
 /bundles/org.openhab.binding.somfytahoma/ @octa22
 /bundles/org.openhab.binding.sonos/ @kgoderis @lolodomo
 /bundles/org.openhab.binding.sonyaudio/ @freke

diff --git a/bom/openhab-addons/pom.xml b/bom/openhab-addons/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>org.openhab.addons.bom</groupId>
  <artifactId>org.openhab.addons.reactor.bom</artifactId>
- <version>2.5.5-SNAPSHOT</version>
+ <version>2.5.6-SNAPSHOT</version>
  </parent>
 
  <artifactId>org.openhab.addons.bom.openhab-addons</artifactId>
@@ -161,6 +161,11 @@
  <artifactId>org.openhab.binding.daikin</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>org.openhab.addons.bundles</groupId>
+ <artifactId>org.openhab.binding.danfossairunit</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  <dependency>
  <groupId>org.openhab.addons.bundles</groupId>
  <artifactId>org.openhab.binding.darksky</artifactId>
@@ -231,6 +236,16 @@
  <artifactId>org.openhab.binding.elerotransmitterstick</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>org.openhab.addons.bundles</groupId>
+ <artifactId>org.openhab.binding.energenie</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openhab.addons.bundles</groupId>
+ <artifactId>org.openhab.binding.enigma2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  <dependency>
  <groupId>org.openhab.addons.bundles</groupId>
  <artifactId>org.openhab.binding.enocean</artifactId>
@@ -526,6 +541,11 @@
  <artifactId>org.openhab.binding.melcloud</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>org.openhab.addons.bundles</groupId>
+ <artifactId>org.openhab.binding.meteoalerte</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  <dependency>
  <groupId>org.openhab.addons.bundles</groupId>
  <artifactId>org.openhab.binding.meteoblue</artifactId>
@@ -701,6 +721,11 @@
  <artifactId>org.openhab.binding.opensprinkler</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>org.openhab.addons.bundles</groupId>
+ <artifactId>org.openhab.binding.openthermgateway</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  <dependency>
  <groupId>org.openhab.addons.bundles</groupId>
  <artifactId>org.openhab.binding.openuv</artifactId>

diff --git a/bom/openhab-core-index/pom.xml b/bom/openhab-core-index/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>org.openhab.addons.bom</groupId>
  <artifactId>org.openhab.addons.reactor.bom</artifactId>
- <version>2.5.5-SNAPSHOT</version>
+ <version>2.5.6-SNAPSHOT</version>
  </parent>
 
  <artifactId>org.openhab.addons.bom.openhab-core-index</artifactId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>org.openhab.addons</groupId>
  <artifactId>org.openhab.addons.reactor</artifactId>
- <version>2.5.5-SNAPSHOT</version>
+ <version>2.5.6-SNAPSHOT</version>
  </parent>
 
  <groupId>org.openhab.addons.bom</groupId>

diff --git a/bom/runtime-index/pom.xml b/bom/runtime-index/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>org.openhab.addons.bom</groupId>
  <artifactId>org.openhab.addons.reactor.bom</artifactId>
- <version>2.5.5-SNAPSHOT</version>
+ <version>2.5.6-SNAPSHOT</version>
  </parent>
 
  <artifactId>org.openhab.addons.bom.runtime-index</artifactId>

diff --git a/bom/test-index/pom.xml b/bom/test-index/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>org.openhab.addons.bom</groupId>
  <artifactId>org.openhab.addons.reactor.bom</artifactId>
- <version>2.5.5-SNAPSHOT</version>
+ <version>2.5.6-SNAPSHOT</version>
  </parent>
 
  <artifactId>org.openhab.addons.bom.test-index</artifactId>

diff --git a/bundles/create_openhab_binding_skeleton.cmd b/bundles/create_openhab_binding_skeleton.cmd
@@ -11,7 +11,7 @@ IF %ARGC% NEQ 3 (
 )
 
 SET OpenhabCoreVersion="2.5.0"
-SET OpenhabVersion="2.5.5-SNAPSHOT"
+SET OpenhabVersion="2.5.6-SNAPSHOT"
 
 SET BindingIdInCamelCase=%~1
 SET BindingIdInLowerCase=%BindingIdInCamelCase%

diff --git a/bundles/create_openhab_binding_skeleton.sh b/bundles/create_openhab_binding_skeleton.sh
@@ -3,7 +3,7 @@
 [ $# -lt 3 ] && { echo "Usage: $0 <BindingIdInCamelCase> <Author> <GitHub Username>"; exit 1; }
 
 openHABCoreVersion=2.5.0
-openHABVersion=2.5.5-SNAPSHOT
+openHABVersion=2.5.6-SNAPSHOT
 
 camelcaseId=$1
 id=`echo $camelcaseId | tr '[:upper:]' '[:lower:]'`

diff --git a/bundles/org.openhab.binding.adorne/pom.xml b/bundles/org.openhab.binding.adorne/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>org.openhab.addons.bundles</groupId>
  <artifactId>org.openhab.addons.reactor.bundles</artifactId>
- <version>2.5.5-SNAPSHOT</version>
+ <version>2.5.6-SNAPSHOT</version>
  </parent>
 
  <artifactId>org.openhab.binding.adorne</artifactId>

diff --git a/bundles/org.openhab.binding.airquality/pom.xml b/bundles/org.openhab.binding.airquality/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>org.openhab.addons.bundles</groupId>
  <artifactId>org.openhab.addons.reactor.bundles</artifactId>
- <version>2.5.5-SNAPSHOT</version>
+ <version>2.5.6-SNAPSHOT</version>
  </parent>
 
  <artifactId>org.openhab.binding.airquality</artifactId>

diff --git a/bundles/org.openhab.binding.airvisualnode/pom.xml b/bundles/org.openhab.binding.airvisualnode/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>org.openhab.addons.bundles</groupId>
  <artifactId>org.openhab.addons.reactor.bundles</artifactId>
- <version>2.5.5-SNAPSHOT</version>
+ <version>2.5.6-SNAPSHOT</version>
  </parent>
 
  <artifactId>org.openhab.binding.airvisualnode</artifactId>

diff --git a/bundles/org.openhab.binding.alarmdecoder/README.md b/bundles/org.openhab.binding.alarmdecoder/README.md
@@ -23,6 +23,7 @@ The binding supports the following thing types:
 * `keypad` - Reports keypad status and optionally sends keypad messages.
 * `zone` - Reports status from zone expanders and relay expanders, and also from built-in zones via emulation.
 * `rfzone` - Reports status from RF zones.
+* `vzone` - Sends commands to virtual zones.
 * `lrr` - Reports messages sent from the panel to a Long Range Radio (LRR) or emulated LRR device.
 
 ## Discovery
@@ -86,6 +87,30 @@ Bridge alarmdecoder:serialbridge:ad1 [ serialPort="/dev/ttyS1", bitrate=115200,
 }
 ```
 
+### keypad
+
+The `keypad` thing reports keypad status and optionally sends keypad messages.
+For panels that support multiple keypad addresses, it can be configured with an address mask of one or more keypad(s) for which it will receive messages.
+When sending messages, it will send from the configured keypad address if only one is configured.
+If a mask containing multiple addresses or 0 (all) is configured, it will send messages from the Alarm Decoder's configured address.
+
+Commands sent from the keypad thing are limited to the set of valid keypad command characters supported by the Alarm Decoder (0-9,*,#,<,>).
+In addition, the characters A-H will be translated to special keys 1-8.
+Command strings containing invalid characters will be ignored.
+
+Parameters:
+
+* `addressMask` (required) Keypad address mask (0 = All addresses)
+* `sendCommands` (default = false) Allow keypad commands to be sent to the alarm system from openHAB. Enabling this means the alarm system will be only as secure as your openHAB system.
+* `sendStar` (default = false) When disarmed/faulted, automatically send the * character to obtain zone fault information.
+* `commandMapping` (optional) Comma separated list of key/value pairs mapping integers to command strings for `intcommand` channel.
+
+Thing config file example:
+
+```
+ Thing keypad keypad1 [ addressMask=0, sendCommands=true ]
+```
+
 ### zone
 
 The `zone` thing reports status from zone expanders and relay expanders, and also from built-in zones via emulation.
@@ -115,34 +140,28 @@ Thing config file example:
  Thing rfzone motion1 [ serial=0180010 ]
 ```
 
-### keypad
+### vzone
 
-The `keypad` thing reports keypad status and optionally sends keypad messages.
-For panels that support multiple keypad addresses, it can be configured with an address mask of one or more keypad(s) for which it will receive messages.
-When sending messages, it will send from the configured keypad address if only one is configured.
-If a mask containing multiple addresses or 0 (all) is configured, it will send messages from the Alarm Decoder's configured address.
-
-Commands sent from the keypad thing are limited to the set of valid keypad command characters supported by the Alarm Decoder (0-9,*,#,<,>).
-In addition, the characters A-H will be translated to special keys 1-8.
-Command strings containing invalid characters will be ignored.
+The `vzone` thing sends open/close commands a virtual zone.
+After enabling zone expander emulation on both the alarm panel and the Alarm Decoder device, it can be used to control the state of a virtual zone.
+The `command` channel is write-only, and accepts either the string "OPEN" or the string "CLOSED".
+The `state` channel is a switch type channel that reflects the current state of the virtual zone (ON=closed/OFF=open).
 
 Parameters:
 
-* `addressMask` (required) Keypad address mask (0 = All addresses)
-* `sendCommands` (default = false) Allow keypad commands to be sent to the alarm system from openHAB. Enabling this means the alarm system will be only as secure as your openHAB system.
-* `sendStar` (default = false) When disarmed/faulted, automatically send the * character to obtain zone fault information.
-* `commandMapping` (optional) Comma separated list of key/value pairs mapping integers to command strings for `intcommand` channel.
+* `address` (required) Virtual zone number (0-99)
 
 Thing config file example:
 
 ```
- Thing keypad keypad1 [ addressMask=0, sendCommands=true ]
+ Thing vzone watersensor [ address=41 ]
 ```
 
 ### lrr
 
 The `lrr` thing reports messages sent to a Long Range Radio (LRR) or emulated LRR device.
-These are specifically formatted messages as described in the [SIA DC-05-1999.09](http://www.alarmdecoder.com/wiki/index.php/File:SIA-ContactIDCodes_Protocol.pdf) standard for Contact ID reporting.
+These are normally specifically formatted messages as described in the [SIA DC-05-1999.09](http://www.alarmdecoder.com/wiki/index.php/File:SIA-ContactIDCodes_Protocol.pdf) standard for Contact ID reporting.
+They can also, depending on configuration, be other types of messages as described [here](http://www.alarmdecoder.com/wiki/index.php/LRR_Support).
 For panels that support multiple partitions, the partition for which a given lrr thing will receive messages can be defined.
 
 * `partition` (default = 0) Partition for which to receive LRR events (0 = All)
@@ -174,12 +193,20 @@ The alarmdecoder things expose the following channels:
 | loop3 | Contact | RO |Loop 3 state |
 | loop4 | Contact | RO |Loop 4 state |
 
+**vzone**
+
+| channel | type |RO/RW| description |
+|--------------|---------|-----|------------------------------|
+| command | String | WO |"OPEN" or "CLOSED" command |
+| state | Switch | RW |Zone state (ON = closed) |
+
 **keypad**
 
 | channel | type |RO/RW| description |
 |--------------|---------|-----|------------------------------|
 | zone | Number | RO |Zone number for status |
 | text | String | RO |Keypad message text |
+| ready | Switch | RO |Panel ready |
 | armedaway | Switch | RO |Armed/Away Indicator |
 | armedhome | Switch | RO |Armed/Stay Indicator |
 | backlight | Switch | RO |Keypad backlight on |
@@ -220,6 +247,7 @@ Bridge alarmdecoder:ipbridge:ad1 [ hostname="cerberus.home", tcpPort=10000, disc
  Thing zone frontdoor [ address=10, channel=1 ]
  Thing zone backdoor [ address=11, channel=1 ]
  Thing rfzone motion1 [ serial=0180010 ]
+ Thing vzone watersensor [ address=41 ]
  Thing keypad keypad1 [ addressMask=0, sendCommands=true ]
  Thing lrr lrr [ partition=0 ]
 }
@@ -245,6 +273,8 @@ Contact Motion1Loop2 "Loop 2" {channel="alarmdecoder:rfzone:ad1:motion1:loop2"}
 Contact Motion1Loop3 "Loop 3" {channel="alarmdecoder:rfzone:ad1:motion1:loop3"}
 Contact Motion1Loop4 "Loop 4" {channel="alarmdecoder:rfzone:ad1:motion1:loop4"}
 
+String WaterSensorCmd "Virtual Zone Command" {channel="alarmdecoder:vzone:ad1:watersensor:command"}
+
 Number LrrPartition "Partition Number [%d]" {channel="alarmdecoder:lrr:ad1:lrr:partition"}
 Number LrrEventData "CID Event Data [%d]" {channel="alarmdecoder:lrr:ad1:lrr:eventdata"}
 String LrrMessage "CID Message" {channel="alarmdecoder:lrr:ad1:lrr:cidmessage"}

diff --git a/bundles/org.openhab.binding.alarmdecoder/pom.xml b/bundles/org.openhab.binding.alarmdecoder/pom.xml
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
  <modelVersion>4.0.0</modelVersion>
 
  <parent>
  <groupId>org.openhab.addons.bundles</groupId>
  <artifactId>org.openhab.addons.reactor.bundles</artifactId>
- <version>2.5.5-SNAPSHOT</version>
+ <version>2.5.6-SNAPSHOT</version>
  </parent>
 
  <artifactId>org.openhab.binding.alarmdecoder</artifactId>

diff --git a/...src/main/java/org/openhab/binding/alarmdecoder/internal/AlarmDecoderBindingConstants.java b/...src/main/java/org/openhab/binding/alarmdecoder/internal/AlarmDecoderBindingConstants.java
@@ -37,6 +37,7 @@ public class AlarmDecoderBindingConstants {
  public static final ThingTypeUID THING_TYPE_SERIALBRIDGE = new ThingTypeUID(BINDING_ID, "serialbridge");
  public static final ThingTypeUID THING_TYPE_ZONE = new ThingTypeUID(BINDING_ID, "zone");
  public static final ThingTypeUID THING_TYPE_RFZONE = new ThingTypeUID(BINDING_ID, "rfzone");
+ public static final ThingTypeUID THING_TYPE_VZONE = new ThingTypeUID(BINDING_ID, "vzone");
  public static final ThingTypeUID THING_TYPE_KEYPAD = new ThingTypeUID(BINDING_ID, "keypad");
  public static final ThingTypeUID THING_TYPE_LRR = new ThingTypeUID(BINDING_ID, "lrr");
 
@@ -54,6 +55,10 @@ public class AlarmDecoderBindingConstants {
  public static final String PROPERTY_ID = "id";
 
  public static final String CHANNEL_CONTACT = "contact";
+ public static final String CHANNEL_STATE = "state";
+
+ // Channel IDs for VZoneHandler
+ public static final String CHANNEL_COMMAND = "command";
 
  // Channel IDs for RFZoneHandler
  public static final String PROPERTY_SERIAL = "serial";

diff --git a/...r/src/main/java/org/openhab/binding/alarmdecoder/internal/AlarmDecoderHandlerFactory.java b/...r/src/main/java/org/openhab/binding/alarmdecoder/internal/AlarmDecoderHandlerFactory.java
@@ -38,6 +38,7 @@
 import org.openhab.binding.alarmdecoder.internal.handler.LRRHandler;
 import org.openhab.binding.alarmdecoder.internal.handler.RFZoneHandler;
 import org.openhab.binding.alarmdecoder.internal.handler.SerialBridgeHandler;
+import org.openhab.binding.alarmdecoder.internal.handler.VZoneHandler;
 import org.openhab.binding.alarmdecoder.internal.handler.ZoneHandler;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.annotations.Activate;
@@ -58,7 +59,7 @@ public class AlarmDecoderHandlerFactory extends BaseThingHandlerFactory {
 
  private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Collections
  .unmodifiableSet(Stream.of(THING_TYPE_IPBRIDGE, THING_TYPE_SERIALBRIDGE, THING_TYPE_ZONE, THING_TYPE_RFZONE,
- THING_TYPE_KEYPAD, THING_TYPE_LRR).collect(Collectors.toSet()));
+ THING_TYPE_VZONE, THING_TYPE_KEYPAD, THING_TYPE_LRR).collect(Collectors.toSet()));
 
  private final Logger logger = LoggerFactory.getLogger(AlarmDecoderHandlerFactory.class);
 
@@ -94,6 +95,8 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
  return new ZoneHandler(thing);
  } else if (THING_TYPE_RFZONE.equals(thingTypeUID)) {
  return new RFZoneHandler(thing);
+ } else if (THING_TYPE_VZONE.equals(thingTypeUID)) {
+ return new VZoneHandler(thing);
  } else if (THING_TYPE_KEYPAD.equals(thingTypeUID)) {
  return new KeypadHandler(thing);
  } else if (THING_TYPE_LRR.equals(thingTypeUID)) {

diff --git a/...rmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/config/VZoneConfig.java b/...rmdecoder/src/main/java/org/openhab/binding/alarmdecoder/internal/config/VZoneConfig.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2010-2020 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.alarmdecoder.internal.config;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * The {@link VZoneConfig} class contains fields mapping thing configuration parameters for VZoneHandler.
+ *
+ * @author Bob Adair - Initial contribution
+ */
+@NonNullByDefault
+public class VZoneConfig {
+ public int address = -1;
+}