mirror of
https://github.com/openhab/openhab-addons.git
synced 2025-01-10 15:11:59 +01:00
[ecotouch] Adding Warmwater Hystersis (#16815)
* Adding Warmwater Hystersis Signed-off-by: Frank Münster <kalinrow@web.de> Signed-off-by: Ciprian Pascu <contact@ciprianpascu.ro>
This commit is contained in:
parent
685fa4bdc3
commit
b82168c188
@ -71,6 +71,7 @@ Advanced channels:
|
|||||||
| enable_pool | Switch | no | Enable Pool |
|
| enable_pool | Switch | no | Enable Pool |
|
||||||
| enable_pv | Switch | no | Enable PV |
|
| enable_pv | Switch | no | Enable PV |
|
||||||
| hysteresis_heating | Number:Temperature | no | Hysteresis Heating |
|
| hysteresis_heating | Number:Temperature | no | Hysteresis Heating |
|
||||||
|
| hysteresis_warmwater | Number:Temperature | no | Hysteresis Warm Water |
|
||||||
| interruptions | Number:Dimensionless | yes | Interruptions |
|
| interruptions | Number:Dimensionless | yes | Interruptions |
|
||||||
| manual_4wayvalve | Number:Dimensionless | no | Operating Mode 4Way Valve |
|
| manual_4wayvalve | Number:Dimensionless | no | Operating Mode 4Way Valve |
|
||||||
| manual_coolvalve | Number:Dimensionless | no | Operating Mode Cooling Valve |
|
| manual_coolvalve | Number:Dimensionless | no | Operating Mode Cooling Valve |
|
||||||
|
@ -12,9 +12,14 @@
|
|||||||
*/
|
*/
|
||||||
package org.openhab.binding.ecotouch.internal;
|
package org.openhab.binding.ecotouch.internal;
|
||||||
|
|
||||||
import static org.openhab.core.library.unit.MetricPrefix.*;
|
import static org.openhab.core.library.unit.MetricPrefix.KILO;
|
||||||
import static org.openhab.core.library.unit.SIUnits.*;
|
import static org.openhab.core.library.unit.SIUnits.CELSIUS;
|
||||||
import static org.openhab.core.library.unit.Units.*;
|
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.math.BigDecimal;
|
||||||
import java.util.LinkedList;
|
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)
|
// German: Außentemperatur gemittelt über 1h (scheinbar identisch zu A2)
|
||||||
TYPE_TEMPERATURE2_OUTSIDE_1H {
|
TYPE_TEMPERATURE2_OUTSIDE_1H {
|
||||||
{
|
{
|
||||||
|
@ -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.label = Enable Water
|
||||||
channel-type.ecotouch.enable_warmwater.description = Enable Warm Water
|
channel-type.ecotouch.enable_warmwater.description = Enable Warm Water
|
||||||
channel-type.ecotouch.hysteresis_heating.label = Hysteresis Heating
|
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.interruptions.label = Interruptions
|
||||||
channel-type.ecotouch.manual_4wayvalve.label = Enable 4Way Valve
|
channel-type.ecotouch.manual_4wayvalve.label = Enable 4Way Valve
|
||||||
channel-type.ecotouch.manual_4wayvalve.description = Operating Mode 4Way Valve
|
channel-type.ecotouch.manual_4wayvalve.description = Operating Mode 4Way Valve
|
||||||
|
@ -51,6 +51,7 @@
|
|||||||
<channel id="percent_source_pump" typeId="percent_source_pump"/>
|
<channel id="percent_source_pump" typeId="percent_source_pump"/>
|
||||||
<channel id="percent_compressor" typeId="percent_compressor"/>
|
<channel id="percent_compressor" typeId="percent_compressor"/>
|
||||||
<channel id="hysteresis_heating" typeId="hysteresis_heating"/>
|
<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="temperature2_outside_1h" typeId="temperature2_outside_1h"/>
|
||||||
<channel id="nviNormAussen" typeId="nviNormAussen"/>
|
<channel id="nviNormAussen" typeId="nviNormAussen"/>
|
||||||
<channel id="nviHeizkreisNorm" typeId="nviHeizkreisNorm"/>
|
<channel id="nviHeizkreisNorm" typeId="nviHeizkreisNorm"/>
|
||||||
@ -197,6 +198,7 @@
|
|||||||
<channel id="percent_source_pump" typeId="percent_source_pump"/>
|
<channel id="percent_source_pump" typeId="percent_source_pump"/>
|
||||||
<channel id="percent_compressor" typeId="percent_compressor"/>
|
<channel id="percent_compressor" typeId="percent_compressor"/>
|
||||||
<channel id="hysteresis_heating" typeId="hysteresis_heating"/>
|
<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="temperature2_outside_1h" typeId="temperature2_outside_1h"/>
|
||||||
<channel id="nviNormAussen" typeId="nviNormAussen"/>
|
<channel id="nviNormAussen" typeId="nviNormAussen"/>
|
||||||
<channel id="nviHeizkreisNorm" typeId="nviHeizkreisNorm"/>
|
<channel id="nviHeizkreisNorm" typeId="nviHeizkreisNorm"/>
|
||||||
@ -549,6 +551,12 @@
|
|||||||
<category>Temperature</category>
|
<category>Temperature</category>
|
||||||
<state readOnly="false" pattern="%.1f %unit%"/>
|
<state readOnly="false" pattern="%.1f %unit%"/>
|
||||||
</channel-type>
|
</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">
|
<channel-type id="temperature2_outside_1h" advanced="true">
|
||||||
<item-type>Number:Temperature</item-type>
|
<item-type>Number:Temperature</item-type>
|
||||||
<label>Outside 1h Average</label>
|
<label>Outside 1h Average</label>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<thing-type uid="ecotouch:geo">
|
<thing-type uid="ecotouch:geo">
|
||||||
<properties>
|
<properties>
|
||||||
<property name="thingTypeVersion">1</property>
|
<property name="thingTypeVersion">2</property>
|
||||||
</properties>
|
</properties>
|
||||||
<instruction-set targetVersion="1">
|
<instruction-set targetVersion="1">
|
||||||
<add-channel id="percent_water_limit_min">
|
<add-channel id="percent_water_limit_min">
|
||||||
@ -21,11 +21,16 @@
|
|||||||
<type>Number:Dimensionless</type>
|
<type>Number:Dimensionless</type>
|
||||||
</add-channel>
|
</add-channel>
|
||||||
</instruction-set>
|
</instruction-set>
|
||||||
|
<instruction-set targetVersion="2">
|
||||||
|
<add-channel id="hysteresis_warmwater">
|
||||||
|
<type>ecotouch:hysteresis_warmwater</type>
|
||||||
|
</add-channel>
|
||||||
|
</instruction-set>
|
||||||
</thing-type>
|
</thing-type>
|
||||||
|
|
||||||
<thing-type uid="ecotouch:air">
|
<thing-type uid="ecotouch:air">
|
||||||
<properties>
|
<properties>
|
||||||
<property name="thingTypeVersion">1</property>
|
<property name="thingTypeVersion">2</property>
|
||||||
</properties>
|
</properties>
|
||||||
<instruction-set targetVersion="1">
|
<instruction-set targetVersion="1">
|
||||||
<add-channel id="percent_water_limit_min">
|
<add-channel id="percent_water_limit_min">
|
||||||
@ -41,6 +46,11 @@
|
|||||||
<type>Number:Dimensionless</type>
|
<type>Number:Dimensionless</type>
|
||||||
</add-channel>
|
</add-channel>
|
||||||
</instruction-set>
|
</instruction-set>
|
||||||
|
<instruction-set targetVersion="2">
|
||||||
|
<add-channel id="hysteresis_warmwater">
|
||||||
|
<type>ecotouch:hysteresis_warmwater</type>
|
||||||
|
</add-channel>
|
||||||
|
</instruction-set>
|
||||||
</thing-type>
|
</thing-type>
|
||||||
|
|
||||||
</update:update-descriptions>
|
</update:update-descriptions>
|
||||||
|
Loading…
Reference in New Issue
Block a user