Fix/update channels for setting hot water target temperature (#11135)

Signed-off-by: Stefan Giehl <stefangiehl@gmail.com>

diff --git a/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/LuxtronikHeatpumpHandler.java b/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/LuxtronikHeatpumpHandler.java
index 281d5920c3167b9a51dbf54cd08c127685890111..bd0883581cf0a3bbb08d066ac5648eb9713aa0cb 100644 (file)
--- a/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/LuxtronikHeatpumpHandler.java
+++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/LuxtronikHeatpumpHandler.java
@@ -162,6 +162,7 @@ public class LuxtronikHeatpumpHandler extends BaseThingHandler {
             case CHANNEL_EINST_BWS_AKT:
             case CHANNEL_EINST_KUCFTL_AKT:
             case CHANNEL_SOLLWERT_KUCFTL_AKT:
+            case CHANNEL_SOLL_BWS_AKT:
                 float temperature = ((DecimalType) command).floatValue();
                 value = (int) (temperature * 10);
                 break;

diff --git a/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/enums/HeatpumpChannel.java b/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/enums/HeatpumpChannel.java
index 440499b49d633dc627105cb96ae50de23595979e..a0f042d7d86bf8deda828f3a53265edb07262c75 100644 (file)
--- a/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/enums/HeatpumpChannel.java
+++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/enums/HeatpumpChannel.java
@@ -1204,10 +1204,10 @@ public enum HeatpumpChannel {
             HeatpumpVisibility.HEIZUNG),
 
     /**
-     * Hot water temperature
-     * (original: Warmwasser Soll Temperatur)
+     * Coverage Heat pump (Hot Water)
+     * (original: Deckung Wärmepumpe)
      */
-    CHANNEL_EINST_BWS_AKT(2, "temperatureHotWaterTarget", NumberItem.class, SIUnits.CELSIUS, true,
+    CHANNEL_EINST_BWS_AKT(2, "temperatureHotWaterCoverage", NumberItem.class, SIUnits.CELSIUS, true,
             HeatpumpVisibility.BRAUWASSER),
 
     /**
@@ -1271,6 +1271,13 @@ public enum HeatpumpChannel {
     CHANNEL_EINST_BWTDI_AKT_AL(27, "thermalDisinfectionPermanent", SwitchItem.class, null, true,
             HeatpumpVisibility.THERMDESINFEKT),
 
+    /**
+     * Hot water target temperature
+     * (original: Warmwasser Soll Temperatur)
+     */
+    CHANNEL_SOLL_BWS_AKT(105, "temperatureHotWaterTarget", NumberItem.class, SIUnits.CELSIUS, true,
+            HeatpumpVisibility.BRAUWASSER),
+
     /**
      * Comfort cooling mode
      * (original: Comfort Kühlung Betriebsart)

diff --git a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump_de.properties b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump_de.properties
index b1b32f6ff61577bc4287aa5d200f1745b7a48564..af6697bfdbd9fdbb0586b6351812e1284ad16958 100644 (file)
--- a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump_de.properties
+++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump_de.properties
@@ -26,6 +26,7 @@ channel-type.luxtronikheatpump.temperatureOutside.label = Außentemp.
 channel-type.luxtronikheatpump.temperatureOutsideMean.label = Durchschnittstemp. Außen über 24 h (Funktion Heizgrenze)
 channel-type.luxtronikheatpump.temperatureHotWater.label = Warmwasser Ist-Temp.
 channel-type.luxtronikheatpump.temperatureHotWaterTarget.label = Warmwasser Soll-Temp.
+channel-type.luxtronikheatpump.temperatureHotWaterCoverage.label = Warmwasser Deckung WP
 channel-type.luxtronikheatpump.temperatureHeatSourceInlet.label = Wärmequellen-Eintrittstemp.
 channel-type.luxtronikheatpump.temperatureHeatSourceOutlet.label = Wärmequellen-Austrittstemp.
 channel-type.luxtronikheatpump.temperatureMixingCircuit1Flow.label = Mischkreis 1 Vorlauftemp.

diff --git a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/thing/channels.xml
index 9fc0eba9efacc5f6d86d8ba360b256390f6c3bbf..5d4a9a590c40d84eb65f5d0149ea4909a9c4aa9d 100644 (file)
--- a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/thing/channels.xml
@@ -1954,9 +1954,9 @@
                <state pattern="%.1f %unit%" min="-10" max="10" step="0.5"></state>
        </channel-type>
 
-       <channel-type id="temperatureHotWaterTarget">
+       <channel-type id="temperatureHotWaterCoverage">
                <item-type>Number:Temperature</item-type>
-               <label>Hot Water Target Temp.</label>
+               <label>Coverage Hot Water Temp.</label>
                <category>Temperature</category>
                <state pattern="%.1f %unit%" min="30" max="65" step="0.5"></state>
        </channel-type>
@@ -2029,6 +2029,13 @@
                <label>Thermal Disinfection (Permanent)</label>
        </channel-type>
 
+       <channel-type id="temperatureHotWaterTarget">
+               <item-type>Number:Temperature</item-type>
+               <label>Hot Water Target Temp.</label>
+               <category>Temperature</category>
+               <state pattern="%.1f %unit%" min="30" max="65" step="0.5"></state>
+       </channel-type>
+
        <channel-type id="comfortCoolingMode">
                <item-type>Number</item-type>
                <label>Comfort Cooling Mode</label>

diff --git a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/thing/thing-types.xml
index d4589d1384aed0500a977588fa9b9f4032ba3360..e45b66e738ef8983746d9e6e970eea45398c11c8 100644 (file)
--- a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/thing/thing-types.xml
@@ -16,6 +16,7 @@
                        <channel id="temperatureOutsideMean" typeId="temperatureOutsideMean"/>
                        <channel id="temperatureHotWater" typeId="temperatureHotWater"/>
                        <channel id="temperatureHotWaterTarget" typeId="temperatureHotWaterTarget"/>
+                       <channel id="temperatureHotWaterCoverage" typeId="temperatureHotWaterCoverage"/>
                        <channel id="temperatureHeatSourceInlet" typeId="temperatureHeatSourceInlet"/>
                        <channel id="temperatureHeatSourceOutlet" typeId="temperatureHeatSourceOutlet"/>
                        <channel id="temperatureMixingCircuit1Flow" typeId="temperatureMixingCircuit1Flow"/>