Merge branch 'enricobaros-5219-davis_via_IP'

Dennis650 · Jul 5, 2019 · 4d2291d · 4d2291d
2 parents 4c25bef + 5953e28
commit 4d2291d
Show file tree

Hide file tree

Showing 4 changed files with 847 additions and 51 deletions.
diff --git a/bundles/binding/org.openhab.binding.davis/README.md b/bundles/binding/org.openhab.binding.davis/README.md
@@ -1,6 +1,6 @@
 # Davis Binding
 
-The openHAB Davis binding supports reading data from Davis weather stations.  Most Davis weather stations should be supported.
+The openHAB Davis binding supports reading data from Davis weather stations.  Most Davis weather stations should be supported. 
 
 The binding is based on the [Serial Communication Reference Manual](http://www.google.at/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCQQFjAA&url=http%3A%2F%2Fwww.davisnet.com%2Fsupport%2Fweather%2Fdownload%2FVantageSerialProtocolDocs_v261.pdf&ei=yns1VLO9B9Pe7Ab9hYDgDQ&usg=AFQjCNEUP_O6jjV3tHaxc7_faaLKWAtw2g&sig2=0YuJy45Qmk76RlffOqayuA&bvm=bv.76943099,d.ZGU) from Davis.
 
@@ -9,10 +9,15 @@ The binding is based on the [Serial Communication Reference Manual](http://www.g
 
 The binding can be configured in the file `services/davis.cfg`.
 
-| Property | Default | Required | Description                            |
-|----------|---------|:--------:|----------------------------------------|
-| port     |         | Yes      | The serial port of the Weather station |
-| refresh  | 10000   | No       | The refresh interval (in milliseconds) |
+Connection type may be serial (port given in property 'port') or ip (hostName property).
+
+| Property             | Default  | Required                    | Description                                                           |
+|----------------------|----------|-----------------------------|-----------------------------------------------------------------------|
+| port                 |          | Yes if serial communication | The serial port of the Weather station                                |
+| hostName             |          | Yes if ip communication     | HostName of the Weather station                                       |
+| refresh              | 10000    | No                          | The refresh interval (in milliseconds)                                |
+| readResponseWaitTime | 200|1000 | No                          | Wait time for response (in milliseconds) 200 if serial - 1000 if ip   |
+
 
 
 ## Item Configuration

diff --git a/...hab.binding.davis/src/main/java/org/openhab/binding/davis/datatypes/DavisCommandType.java b/...hab.binding.davis/src/main/java/org/openhab/binding/davis/datatypes/DavisCommandType.java
@@ -44,6 +44,16 @@ public enum DavisCommandType {
         }
     },
 
+    HILOWS {
+        {
+            command = "HILOWS";
+            responsetype = Constants.RESPONSE_TYPE_ACK;
+            responselimitertype = Constants.RESPONSE_LIMITER_TYPE_FIXED_SIZE;
+            responselength = 438;
+            crcchecktype = Constants.CRC_CHECK_TYPE_VAR1;
+        }
+    },
+
     GETTIME {
         {
             command = "GETTIME";
@@ -159,7 +169,7 @@ public int getCrcchecktype() {
 
     /**
      * Get a specific command.
-     * 
+     *
      * @param command
      *            command key
      * @return DavisCommandType identified by command