Skip to content

Commit 40bc351

Browse files
authored
[ecotouch] Adding Warmwater Hystersis (openhab#16815)
* Adding Warmwater Hystersis Signed-off-by: Frank Münster <[email protected]>
1 parent 95ec85a commit 40bc351

File tree

5 files changed

+40
-5
lines changed

5 files changed

+40
-5
lines changed

bundles/org.openhab.binding.ecotouch/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ Advanced channels:
7171
| enable_pool | Switch | no | Enable Pool |
7272
| enable_pv | Switch | no | Enable PV |
7373
| hysteresis_heating | Number:Temperature | no | Hysteresis Heating |
74+
| hysteresis_warmwater | Number:Temperature | no | Hysteresis Warm Water |
7475
| interruptions | Number:Dimensionless | yes | Interruptions |
7576
| manual_4wayvalve | Number:Dimensionless | no | Operating Mode 4Way Valve |
7677
| manual_coolvalve | Number:Dimensionless | no | Operating Mode Cooling Valve |

bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java

+17-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@
1212
*/
1313
package org.openhab.binding.ecotouch.internal;
1414

15-
import static org.openhab.core.library.unit.MetricPrefix.*;
16-
import static org.openhab.core.library.unit.SIUnits.*;
17-
import static org.openhab.core.library.unit.Units.*;
15+
import static org.openhab.core.library.unit.MetricPrefix.KILO;
16+
import static org.openhab.core.library.unit.SIUnits.CELSIUS;
17+
import static org.openhab.core.library.unit.Units.BAR;
18+
import static org.openhab.core.library.unit.Units.HOUR;
19+
import static org.openhab.core.library.unit.Units.ONE;
20+
import static org.openhab.core.library.unit.Units.PARTS_PER_MILLION;
21+
import static org.openhab.core.library.unit.Units.PERCENT;
22+
import static org.openhab.core.library.unit.Units.WATT;
1823

1924
import java.math.BigDecimal;
2025
import java.util.LinkedList;
@@ -401,6 +406,15 @@ public enum EcoTouchTags {
401406
}
402407
},
403408

409+
// German: Hysterese Warmwasser
410+
TYPE_HYSTERESIS_WARMWATER {
411+
{
412+
command = "hysteresis_warmwater";
413+
unit = CELSIUS;
414+
tagName = "A139";
415+
}
416+
},
417+
404418
// German: Außentemperatur gemittelt über 1h (scheinbar identisch zu A2)
405419
TYPE_TEMPERATURE2_OUTSIDE_1H {
406420
{

bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ channel-type.ecotouch.enable_pv.label = Enable PV
6161
channel-type.ecotouch.enable_warmwater.label = Enable Water
6262
channel-type.ecotouch.enable_warmwater.description = Enable Warm Water
6363
channel-type.ecotouch.hysteresis_heating.label = Hysteresis Heating
64+
channel-type.ecotouch.hysteresis_warmwater.label = Hysteresis Warm Water
65+
channel-type.ecotouch.hysteresis_warmwater.description = Hysteresis setting for Warm Water
6466
channel-type.ecotouch.interruptions.label = Interruptions
6567
channel-type.ecotouch.manual_4wayvalve.label = Enable 4Way Valve
6668
channel-type.ecotouch.manual_4wayvalve.description = Operating Mode 4Way Valve

bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml

+8
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<channel id="percent_source_pump" typeId="percent_source_pump"/>
5252
<channel id="percent_compressor" typeId="percent_compressor"/>
5353
<channel id="hysteresis_heating" typeId="hysteresis_heating"/>
54+
<channel id="hysteresis_warmwater" typeId="hysteresis_warmwater"/>
5455
<channel id="temperature2_outside_1h" typeId="temperature2_outside_1h"/>
5556
<channel id="nviNormAussen" typeId="nviNormAussen"/>
5657
<channel id="nviHeizkreisNorm" typeId="nviHeizkreisNorm"/>
@@ -197,6 +198,7 @@
197198
<channel id="percent_source_pump" typeId="percent_source_pump"/>
198199
<channel id="percent_compressor" typeId="percent_compressor"/>
199200
<channel id="hysteresis_heating" typeId="hysteresis_heating"/>
201+
<channel id="hysteresis_warmwater" typeId="hysteresis_warmwater"/>
200202
<channel id="temperature2_outside_1h" typeId="temperature2_outside_1h"/>
201203
<channel id="nviNormAussen" typeId="nviNormAussen"/>
202204
<channel id="nviHeizkreisNorm" typeId="nviHeizkreisNorm"/>
@@ -549,6 +551,12 @@
549551
<category>Temperature</category>
550552
<state readOnly="false" pattern="%.1f %unit%"/>
551553
</channel-type>
554+
<channel-type id="hysteresis_warmwater" advanced="true">
555+
<item-type>Number:Temperature</item-type>
556+
<label>Hysteresis Warmwater</label>
557+
<category>Temperature</category>
558+
<state readOnly="false" pattern="%.1f %unit%"/>
559+
</channel-type>
552560
<channel-type id="temperature2_outside_1h" advanced="true">
553561
<item-type>Number:Temperature</item-type>
554562
<label>Outside 1h Average</label>

bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/update/instructions.xml

+12-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<thing-type uid="ecotouch:geo">
77
<properties>
8-
<property name="thingTypeVersion">1</property>
8+
<property name="thingTypeVersion">2</property>
99
</properties>
1010
<instruction-set targetVersion="1">
1111
<add-channel id="percent_water_limit_min">
@@ -21,11 +21,16 @@
2121
<type>Number:Dimensionless</type>
2222
</add-channel>
2323
</instruction-set>
24+
<instruction-set targetVersion="2">
25+
<add-channel id="hysteresis_warmwater">
26+
<type>ecotouch:hysteresis_warmwater</type>
27+
</add-channel>
28+
</instruction-set>
2429
</thing-type>
2530

2631
<thing-type uid="ecotouch:air">
2732
<properties>
28-
<property name="thingTypeVersion">1</property>
33+
<property name="thingTypeVersion">2</property>
2934
</properties>
3035
<instruction-set targetVersion="1">
3136
<add-channel id="percent_water_limit_min">
@@ -41,6 +46,11 @@
4146
<type>Number:Dimensionless</type>
4247
</add-channel>
4348
</instruction-set>
49+
<instruction-set targetVersion="2">
50+
<add-channel id="hysteresis_warmwater">
51+
<type>ecotouch:hysteresis_warmwater</type>
52+
</add-channel>
53+
</instruction-set>
4454
</thing-type>
4555

4656
</update:update-descriptions>

0 commit comments

Comments
 (0)