[ecotouch] Adding Warmwater Hystersis (#16815)

* Adding Warmwater Hystersis

Signed-off-by: Frank Münster <kalinrow@web.de>

diff --git a/bundles/org.openhab.binding.ecotouch/README.md b/bundles/org.openhab.binding.ecotouch/README.md
index f31e068b3c1255888ddb77b5bd8848ab3932f7f4..063c077aaa098ca954a5b1b41a6d76605c038654 100644 (file)
--- a/bundles/org.openhab.binding.ecotouch/README.md
+++ b/bundles/org.openhab.binding.ecotouch/README.md
@@ -71,6 +71,7 @@ Advanced channels:
 | enable_pool                      | Switch               | no        | Enable Pool                                                             |
 | enable_pv                        | Switch               | no        | Enable PV                                                               |
 | hysteresis_heating               | Number:Temperature   | no        | Hysteresis Heating                                                      |
+| hysteresis_warmwater             | Number:Temperature   | no        | Hysteresis Warm Water                                                   |
 | interruptions                    | Number:Dimensionless | yes       | Interruptions                                                           |
 | manual_4wayvalve                 | Number:Dimensionless | no        | Operating Mode 4Way Valve                                               |
 | manual_coolvalve                 | Number:Dimensionless | no        | Operating Mode Cooling Valve                                            |

diff --git a/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java b/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java
index 1fff3d15c017d2f851581c7e0e6ebb4bb392cef8..034940ca6dba36c7346d42fd17cff9c7bb922249 100644 (file)
--- a/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java
+++ b/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java
@@ -12,9 +12,14 @@
  */
 package org.openhab.binding.ecotouch.internal;
 
-import static org.openhab.core.library.unit.MetricPrefix.*;
-import static org.openhab.core.library.unit.SIUnits.*;
-import static org.openhab.core.library.unit.Units.*;
+import static org.openhab.core.library.unit.MetricPrefix.KILO;
+import static org.openhab.core.library.unit.SIUnits.CELSIUS;
+import static org.openhab.core.library.unit.Units.BAR;
+import static org.openhab.core.library.unit.Units.HOUR;
+import static org.openhab.core.library.unit.Units.ONE;
+import static org.openhab.core.library.unit.Units.PARTS_PER_MILLION;
+import static org.openhab.core.library.unit.Units.PERCENT;
+import static org.openhab.core.library.unit.Units.WATT;
 
 import java.math.BigDecimal;
 import java.util.LinkedList;
@@ -401,6 +406,15 @@ public enum EcoTouchTags {
         }
     },
 
+    // German: Hysterese Warmwasser
+    TYPE_HYSTERESIS_WARMWATER {
+        {
+            command = "hysteresis_warmwater";
+            unit = CELSIUS;
+            tagName = "A139";
+        }
+    },
+
     // German: Außentemperatur gemittelt über 1h (scheinbar identisch zu A2)
     TYPE_TEMPERATURE2_OUTSIDE_1H {
         {

diff --git a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties
index 5156960a67936a9ca385681ac098e43fe98fad0a..f952d0eacd431242a159da8ba4d45487d2493aed 100644 (file)
--- a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties
+++ b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties
@@ -61,6 +61,8 @@ channel-type.ecotouch.enable_pv.label = Enable PV
 channel-type.ecotouch.enable_warmwater.label = Enable Water
 channel-type.ecotouch.enable_warmwater.description = Enable Warm Water
 channel-type.ecotouch.hysteresis_heating.label = Hysteresis Heating
+channel-type.ecotouch.hysteresis_warmwater.label = Hysteresis Warm Water
+channel-type.ecotouch.hysteresis_warmwater.description = Hysteresis setting for Warm Water
 channel-type.ecotouch.interruptions.label = Interruptions
 channel-type.ecotouch.manual_4wayvalve.label = Enable 4Way Valve
 channel-type.ecotouch.manual_4wayvalve.description = Operating Mode 4Way Valve

diff --git a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml
index 34d3c1be2e7a655b59d1e70696ab4d44367069e0..375c109400ebbc70e11fa3445130074bb3b3cc97 100644 (file)
--- a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml
@@ -51,6 +51,7 @@
                        <channel id="percent_source_pump" typeId="percent_source_pump"/>
                        <channel id="percent_compressor" typeId="percent_compressor"/>
                        <channel id="hysteresis_heating" typeId="hysteresis_heating"/>
+                       <channel id="hysteresis_warmwater" typeId="hysteresis_warmwater"/>
                        <channel id="temperature2_outside_1h" typeId="temperature2_outside_1h"/>
                        <channel id="nviNormAussen" typeId="nviNormAussen"/>
                        <channel id="nviHeizkreisNorm" typeId="nviHeizkreisNorm"/>
@@ -197,6 +198,7 @@
                        <channel id="percent_source_pump" typeId="percent_source_pump"/>
                        <channel id="percent_compressor" typeId="percent_compressor"/>
                        <channel id="hysteresis_heating" typeId="hysteresis_heating"/>
+                       <channel id="hysteresis_warmwater" typeId="hysteresis_warmwater"/>
                        <channel id="temperature2_outside_1h" typeId="temperature2_outside_1h"/>
                        <channel id="nviNormAussen" typeId="nviNormAussen"/>
                        <channel id="nviHeizkreisNorm" typeId="nviHeizkreisNorm"/>
@@ -549,6 +551,12 @@
                <category>Temperature</category>
                <state readOnly="false" pattern="%.1f %unit%"/>
        </channel-type>
+       <channel-type id="hysteresis_warmwater" advanced="true">
+               <item-type>Number:Temperature</item-type>
+               <label>Hysteresis Warmwater</label>
+               <category>Temperature</category>
+               <state readOnly="false" pattern="%.1f %unit%"/>
+       </channel-type>
        <channel-type id="temperature2_outside_1h" advanced="true">
                <item-type>Number:Temperature</item-type>
                <label>Outside 1h Average</label>

diff --git a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/update/instructions.xml b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/update/instructions.xml
index abe807506088136d6cbd110d7e87bf78265fd9f8..020e2b43e338286eda8afb77d9bbcbc829ae3680 100644 (file)
--- a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/update/instructions.xml
+++ b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/update/instructions.xml
@@ -5,7 +5,7 @@
 
        <thing-type uid="ecotouch:geo">
                <properties>
-                       <property name="thingTypeVersion">1</property>
+                       <property name="thingTypeVersion">2</property>
                </properties>
                <instruction-set targetVersion="1">
                        <add-channel id="percent_water_limit_min">
@@ -21,11 +21,16 @@
                                <type>Number:Dimensionless</type>
                        </add-channel>
                </instruction-set>
+               <instruction-set targetVersion="2">
+                       <add-channel id="hysteresis_warmwater">
+                               <type>ecotouch:hysteresis_warmwater</type>
+                       </add-channel>
+               </instruction-set>
        </thing-type>
 
        <thing-type uid="ecotouch:air">
                <properties>
-                       <property name="thingTypeVersion">1</property>
+                       <property name="thingTypeVersion">2</property>
                </properties>
                <instruction-set targetVersion="1">
                        <add-channel id="percent_water_limit_min">
@@ -41,6 +46,11 @@
                                <type>Number:Dimensionless</type>
                        </add-channel>
                </instruction-set>
+               <instruction-set targetVersion="2">
+                       <add-channel id="hysteresis_warmwater">
+                               <type>ecotouch:hysteresis_warmwater</type>
+                       </add-channel>
+               </instruction-set>
        </thing-type>
 
 </update:update-descriptions>