[openthermgateway] Add Diagnostics indication channel (#9516)

* Added Diagnostics indication channel

Signed-off-by: Arjen Korevaar <a.korevaar@mephix.com>

diff --git a/bundles/org.openhab.binding.openthermgateway/README.md b/bundles/org.openhab.binding.openthermgateway/README.md
index 2c1a514e722311ef3c7e058f446463c742296b7a..17bc52fe2eb71d67c9ce9c58603208b3d7bc2f51 100644 (file)
--- a/bundles/org.openhab.binding.openthermgateway/README.md
+++ b/bundles/org.openhab.binding.openthermgateway/README.md
@@ -65,6 +65,7 @@ The OpenTherm Gateway binding supports the following channels:
 | airpressfault            | Switch               | Air pressure fault                                       | yes       |
 | waterovtemp              | Switch               | Water over-temperature fault                             | yes       |
 | oemfaultcode             | Switch               | OEM fault code                                           | yes       |
+| diag                     | Switch               | Diagnostics indication                                   | yes       |
 | sendcommand              | Text                 | Channel to send commands to the OpenTherm Gateway device | no        |
 
 ## Full Example
@@ -109,6 +110,7 @@ Switch GasFlameFault "Gas or flame fault" <switch> { channel="openthermgateway:o
 Switch AirPressFault "Air pressure fault" <switch> { channel="openthermgateway:otgw:1:airpressfault" }
 Switch WaterOvTemp "Water over-temperature fault" <switch> { channel="openthermgateway:otgw:1:waterovtemp" }
 Number OemFaultCode "OEM fault code" { channel="openthermgateway:otgw:1:oemfaultcode" }
+Switch Diagnostics "Diagnostics indication" { channel="openthermgateway:otgw:1:diag" }
 Text SendCommand "Send command channel" { channel="openthermgateway:otgw:1:sendcommand" }
 ```
 
@@ -148,6 +150,7 @@ sitemap demo label="Main Menu" {
         Switch item="AirPressFault" icon="" label="Air pressure fault"
         Switch item="waterOvTemp" icon="" label="Water over-temperature fault"
         Text item="OemFaultCode" icon="" label="OEM fault code"
+        Switch item="Diagnostics" icon="" label="Diagnostics indication"
     }
 }
 

diff --git a/bundles/org.openhab.binding.openthermgateway/src/main/java/org/openhab/binding/openthermgateway/OpenThermGatewayBindingConstants.java b/bundles/org.openhab.binding.openthermgateway/src/main/java/org/openhab/binding/openthermgateway/OpenThermGatewayBindingConstants.java
index 44f7262d5941a149e19d376feaa56efd3e576cd8..38a9f24cb357ed6e259dc64881f8392ecd50f873 100644 (file)
--- a/bundles/org.openhab.binding.openthermgateway/src/main/java/org/openhab/binding/openthermgateway/OpenThermGatewayBindingConstants.java
+++ b/bundles/org.openhab.binding.openthermgateway/src/main/java/org/openhab/binding/openthermgateway/OpenThermGatewayBindingConstants.java
@@ -12,10 +12,7 @@
  */
 package org.openhab.binding.openthermgateway;
 
-import java.util.Collections;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.thing.ThingTypeUID;
@@ -68,17 +65,17 @@ public class OpenThermGatewayBindingConstants {
     public static final String CHANNEL_AIR_PRESSURE_FAULT = "airpressfault";
     public static final String CHANNEL_WATER_OVER_TEMP = "waterovtemp";
     public static final String CHANNEL_OEM_FAULTCODE = "oemfaultcode";
+    public static final String CHANNEL_DIAGNOSTICS_INDICATION = "diag";
 
-    public static final Set<String> SUPPORTED_CHANNEL_IDS = Collections
-            .unmodifiableSet(Stream.of(CHANNEL_ROOM_TEMPERATURE, CHANNEL_ROOM_SETPOINT, CHANNEL_FLOW_TEMPERATURE,
-                    CHANNEL_RETURN_TEMPERATURE, CHANNEL_OUTSIDE_TEMPERATURE, CHANNEL_CENTRAL_HEATING_WATER_PRESSURE,
-                    CHANNEL_CENTRAL_HEATING_ENABLED, CHANNEL_REQUESTED_CENTRAL_HEATING_ENABLED,
-                    CHANNEL_OVERRIDE_CENTRAL_HEATING_ENABLED, CHANNEL_CENTRAL_HEATING_MODE,
-                    CHANNEL_CENTRAL_HEATING_WATER_SETPOINT, CHANNEL_REQUESTED_CENTRAL_HEATING_WATER_SETPOINT,
-                    CHANNEL_OVERRIDE_CENTRAL_HEATING_WATER_SETPOINT, CHANNEL_DOMESTIC_HOT_WATER_TEMPERATURE,
-                    CHANNEL_DOMESTIC_HOT_WATER_ENABLED, CHANNEL_DOMESTIC_HOT_WATER_MODE,
-                    CHANNEL_DOMESTIC_HOT_WATER_SETPOINT, CHANNEL_FLAME, CHANNEL_RELATIVE_MODULATION_LEVEL,
-                    CHANNEL_MAXIMUM_MODULATION_LEVEL, CHANNEL_FAULT, CHANNEL_SERVICEREQUEST, CHANNEL_REMOTE_RESET,
-                    CHANNEL_LOW_WATER_PRESSURE, CHANNEL_GAS_FLAME_FAULT, CHANNEL_AIR_PRESSURE_FAULT,
-                    CHANNEL_WATER_OVER_TEMP, CHANNEL_OEM_FAULTCODE).collect(Collectors.toSet()));
+    public static final Set<String> SUPPORTED_CHANNEL_IDS = Set.of(CHANNEL_ROOM_TEMPERATURE, CHANNEL_ROOM_SETPOINT,
+            CHANNEL_FLOW_TEMPERATURE, CHANNEL_RETURN_TEMPERATURE, CHANNEL_OUTSIDE_TEMPERATURE,
+            CHANNEL_CENTRAL_HEATING_WATER_PRESSURE, CHANNEL_CENTRAL_HEATING_ENABLED,
+            CHANNEL_REQUESTED_CENTRAL_HEATING_ENABLED, CHANNEL_OVERRIDE_CENTRAL_HEATING_ENABLED,
+            CHANNEL_CENTRAL_HEATING_MODE, CHANNEL_CENTRAL_HEATING_WATER_SETPOINT,
+            CHANNEL_REQUESTED_CENTRAL_HEATING_WATER_SETPOINT, CHANNEL_OVERRIDE_CENTRAL_HEATING_WATER_SETPOINT,
+            CHANNEL_DOMESTIC_HOT_WATER_TEMPERATURE, CHANNEL_DOMESTIC_HOT_WATER_ENABLED, CHANNEL_DOMESTIC_HOT_WATER_MODE,
+            CHANNEL_DOMESTIC_HOT_WATER_SETPOINT, CHANNEL_FLAME, CHANNEL_RELATIVE_MODULATION_LEVEL,
+            CHANNEL_MAXIMUM_MODULATION_LEVEL, CHANNEL_FAULT, CHANNEL_SERVICEREQUEST, CHANNEL_REMOTE_RESET,
+            CHANNEL_LOW_WATER_PRESSURE, CHANNEL_GAS_FLAME_FAULT, CHANNEL_AIR_PRESSURE_FAULT, CHANNEL_WATER_OVER_TEMP,
+            CHANNEL_OEM_FAULTCODE, CHANNEL_DIAGNOSTICS_INDICATION);
 }

diff --git a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/channels.xml
index 5df2483901cdb72231d705cf54583cebe5b0bafa..8bf158cff5860d6c367288fe56a96f9fdcc1e4b6 100644 (file)
--- a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/channels.xml
@@ -233,6 +233,13 @@
                <state readOnly="true"/>
        </channel-type>
 
+       <channel-type id="diag">
+               <item-type>Switch</item-type>
+               <label>Diagnostics Indication</label>
+               <description>Diagnostics indication</description>
+               <state readOnly="true"/>
+       </channel-type>
+
        <channel-type id="sendcommand">
                <item-type>String</item-type>
                <label>Send Command</label>

diff --git a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/otgw.xml b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/otgw.xml
index 40c854a8e15ed47d2f0ff0bb3c3ed4a90869fa8f..583c8efd42d2365ec50905ca94c6c1d75ea6c98c 100644 (file)
--- a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/otgw.xml
+++ b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/otgw.xml
@@ -38,10 +38,11 @@
                        <channel id="airpressfault" typeId="airpressfault"/>
                        <channel id="waterovtemp" typeId="waterovtemp"/>
                        <channel id="oemfaultcode" typeId="oemfaultcode"/>
+                       <channel id="diag" typeId="diag"/>
                        <channel id="sendcommand" typeId="sendcommand"/>
                </channels>
                <properties>
-                       <property name="version">1.0.2</property>
+                       <property name="version">1.1.0</property>
                </properties>
                <config-description-ref uri="thing-type:openthermgateway:otgw"/>
        </thing-type>