diff --git a/bundles/org.openhab.binding.ecotouch/README.md b/bundles/org.openhab.binding.ecotouch/README.md index f31e068b3c1..063c077aaa0 100644 --- 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 1fff3d15c01..034940ca6db 100644 --- 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 5156960a679..f952d0eacd4 100644 --- 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 34d3c1be2e7..375c109400e 100644 --- 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 @@ + @@ -197,6 +198,7 @@ + @@ -549,6 +551,12 @@ Temperature + + Number:Temperature + + Temperature + + Number:Temperature 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 abe80750608..020e2b43e33 100644 --- 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 @@ - 1 + 2 @@ -21,11 +21,16 @@ Number:Dimensionless + + + ecotouch:hysteresis_warmwater + + - 1 + 2 @@ -41,6 +46,11 @@ Number:Dimensionless + + + ecotouch:hysteresis_warmwater + +