File tree 5 files changed +40
-5
lines changed
bundles/org.openhab.binding.ecotouch
java/org/openhab/binding/ecotouch/internal
5 files changed +40
-5
lines changed Original file line number Diff line number Diff line change @@ -71,6 +71,7 @@ Advanced channels:
71
71
| enable_pool | Switch | no | Enable Pool |
72
72
| enable_pv | Switch | no | Enable PV |
73
73
| hysteresis_heating | Number: Temperature | no | Hysteresis Heating |
74
+ | hysteresis_warmwater | Number: Temperature | no | Hysteresis Warm Water |
74
75
| interruptions | Number: Dimensionless | yes | Interruptions |
75
76
| manual_4wayvalve | Number: Dimensionless | no | Operating Mode 4Way Valve |
76
77
| manual_coolvalve | Number: Dimensionless | no | Operating Mode Cooling Valve |
Original file line number Diff line number Diff line change 12
12
*/
13
13
package org .openhab .binding .ecotouch .internal ;
14
14
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 ;
18
23
19
24
import java .math .BigDecimal ;
20
25
import java .util .LinkedList ;
@@ -401,6 +406,15 @@ public enum EcoTouchTags {
401
406
}
402
407
},
403
408
409
+ // German: Hysterese Warmwasser
410
+ TYPE_HYSTERESIS_WARMWATER {
411
+ {
412
+ command = "hysteresis_warmwater" ;
413
+ unit = CELSIUS ;
414
+ tagName = "A139" ;
415
+ }
416
+ },
417
+
404
418
// German: Außentemperatur gemittelt über 1h (scheinbar identisch zu A2)
405
419
TYPE_TEMPERATURE2_OUTSIDE_1H {
406
420
{
Original file line number Diff line number Diff line change @@ -61,6 +61,8 @@ channel-type.ecotouch.enable_pv.label = Enable PV
61
61
channel-type.ecotouch.enable_warmwater.label = Enable Water
62
62
channel-type.ecotouch.enable_warmwater.description = Enable Warm Water
63
63
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
64
66
channel-type.ecotouch.interruptions.label = Interruptions
65
67
channel-type.ecotouch.manual_4wayvalve.label = Enable 4Way Valve
66
68
channel-type.ecotouch.manual_4wayvalve.description = Operating Mode 4Way Valve
Original file line number Diff line number Diff line change 51
51
<channel id =" percent_source_pump" typeId =" percent_source_pump" />
52
52
<channel id =" percent_compressor" typeId =" percent_compressor" />
53
53
<channel id =" hysteresis_heating" typeId =" hysteresis_heating" />
54
+ <channel id =" hysteresis_warmwater" typeId =" hysteresis_warmwater" />
54
55
<channel id =" temperature2_outside_1h" typeId =" temperature2_outside_1h" />
55
56
<channel id =" nviNormAussen" typeId =" nviNormAussen" />
56
57
<channel id =" nviHeizkreisNorm" typeId =" nviHeizkreisNorm" />
197
198
<channel id =" percent_source_pump" typeId =" percent_source_pump" />
198
199
<channel id =" percent_compressor" typeId =" percent_compressor" />
199
200
<channel id =" hysteresis_heating" typeId =" hysteresis_heating" />
201
+ <channel id =" hysteresis_warmwater" typeId =" hysteresis_warmwater" />
200
202
<channel id =" temperature2_outside_1h" typeId =" temperature2_outside_1h" />
201
203
<channel id =" nviNormAussen" typeId =" nviNormAussen" />
202
204
<channel id =" nviHeizkreisNorm" typeId =" nviHeizkreisNorm" />
549
551
<category >Temperature</category >
550
552
<state readOnly =" false" pattern =" %.1f %unit%" />
551
553
</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 >
552
560
<channel-type id =" temperature2_outside_1h" advanced =" true" >
553
561
<item-type >Number:Temperature</item-type >
554
562
<label >Outside 1h Average</label >
Original file line number Diff line number Diff line change 5
5
6
6
<thing-type uid =" ecotouch:geo" >
7
7
<properties >
8
- <property name =" thingTypeVersion" >1 </property >
8
+ <property name =" thingTypeVersion" >2 </property >
9
9
</properties >
10
10
<instruction-set targetVersion =" 1" >
11
11
<add-channel id =" percent_water_limit_min" >
21
21
<type >Number:Dimensionless</type >
22
22
</add-channel >
23
23
</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 >
24
29
</thing-type >
25
30
26
31
<thing-type uid =" ecotouch:air" >
27
32
<properties >
28
- <property name =" thingTypeVersion" >1 </property >
33
+ <property name =" thingTypeVersion" >2 </property >
29
34
</properties >
30
35
<instruction-set targetVersion =" 1" >
31
36
<add-channel id =" percent_water_limit_min" >
41
46
<type >Number:Dimensionless</type >
42
47
</add-channel >
43
48
</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 >
44
54
</thing-type >
45
55
46
56
</update : update-descriptions >
You can’t perform that action at this time.
0 commit comments