[luxtronik] Add channel for fixed heating return temperature (#16218)

* Fix documentation typo

Signed-off-by: René Bärecke <77075719+Taxifahrer@users.noreply.github.com>
* Add channel temperatureHeatingFixedReturnTarget

Signed-off-by: René Bärecke <77075719+Taxifahrer@users.noreply.github.com>
* Make new channel advanced

Signed-off-by: René Bärecke <77075719+Taxifahrer@users.noreply.github.com>
* Added thingTypeVersion to thing-types.xml

Signed-off-by: René Bärecke <77075719+Taxifahrer@users.noreply.github.com>
---------

Signed-off-by: René Bärecke <77075719+Taxifahrer@users.noreply.github.com>

diff --git a/bundles/org.openhab.binding.luxtronikheatpump/README.md b/bundles/org.openhab.binding.luxtronikheatpump/README.md
index e52b732f34939418153bfab5301834d01d62c235..73bc4ae7ad98f1a416e29b71b85b25026dcc2f6c 100644 (file)
--- a/bundles/org.openhab.binding.luxtronikheatpump/README.md
+++ b/bundles/org.openhab.binding.luxtronikheatpump/README.md
@@ -287,26 +287,27 @@ The following channels are holding read only values:
 The usage of the numbered channels above is currently unknown. If you are able to directly match one of the values to any value reported by your heat pump, feel free to report back on the forum, so we are able to give the channel a proper name instead.
 
 The following channels are also writable:
-| channel                                  | type               | advanced | description                          |
-|------------------------------------------|--------------------|----------|--------------------------------------|
-| temperatureHeatingParallelShift          | Number:Temperature |          | Heating temperature (parallel shift) |
-| temperatureHotWaterTarget                | Number:Temperature |          | Hot water target temperature         |
-| heatingMode                              | Number             |          | Heating mode                         |
-| hotWaterMode                             | Number             |          | Hot water operating mode             |
-| thermalDisinfectionMonday                | Switch             | x        | Thermal disinfection (Monday)        |
-| thermalDisinfectionTuesday               | Switch             | x        | Thermal disinfection (Tuesday)       |
-| thermalDisinfectionWednesday             | Switch             | x        | Thermal disinfection (Wednesday)     |
-| thermalDisinfectionThursday              | Switch             | x        | Thermal disinfection (Thursday)      |
-| thermalDisinfectionFriday                | Switch             | x        | Thermal disinfection (Friday)        |
-| thermalDisinfectionSaturday              | Switch             | x        | Thermal disinfection (Saturday)      |
-| thermalDisinfectionSunday                | Switch             | x        | Thermal disinfection (Sunday)        |
-| thermalDisinfectionPermanent             | Switch             | x        | Thermal disinfection (Permanent)     |
-| comfortCoolingMode                       | Number             |          | Comfort cooling mode                 |
-| temperatureComfortCoolingATRelease       | Number:Temperature |          | Comfort cooling AT release           |
-| temperatureComfortCoolingATReleaseTarget | Number:Temperature |          | Comfort cooling AT release target    |
-| temperatureHeatingLimit                  | Number:Temperature |          | Temperature Heating Limit            |
-| comfortCoolingATExcess                   | Number:Time        |          | AT Excess                            |
-| comfortCoolingATUndercut                 | Number:Time        |          | AT undercut                          |
+| channel                                  | type               | advanced | description                                                                         |
+|------------------------------------------|--------------------|----------|-------------------------------------------------------------------------------------|
+| temperatureHeatingParallelShift          | Number:Temperature |          | Heating temperature (parallel shift)                                                |
+| temperatureHotWaterTarget                | Number:Temperature |          | Hot water target temperature                                                        |
+| temperatureHeatingFixedReturnTarget      | Number:Temperature |          | Fixed return target temperature if heat pump is operating in fixed temperature mode |
+| heatingMode                              | Number             |          | Heating mode                                                                        |
+| hotWaterMode                             | Number             |          | Hot water operating mode                                                            |
+| thermalDisinfectionMonday                | Switch             | x        | Thermal disinfection (Monday)                                                       |
+| thermalDisinfectionTuesday               | Switch             | x        | Thermal disinfection (Tuesday)                                                      |
+| thermalDisinfectionWednesday             | Switch             | x        | Thermal disinfection (Wednesday)                                                    |
+| thermalDisinfectionThursday              | Switch             | x        | Thermal disinfection (Thursday)                                                     |
+| thermalDisinfectionFriday                | Switch             | x        | Thermal disinfection (Friday)                                                       |
+| thermalDisinfectionSaturday              | Switch             | x        | Thermal disinfection (Saturday)                                                     |
+| thermalDisinfectionSunday                | Switch             | x        | Thermal disinfection (Sunday)                                                       |
+| thermalDisinfectionPermanent             | Switch             | x        | Thermal disinfection (Permanent)                                                    |
+| comfortCoolingMode                       | Number             |          | Comfort cooling mode                                                                |
+| temperatureComfortCoolingATRelease       | Number:Temperature |          | Comfort cooling AT release                                                          |
+| temperatureComfortCoolingATReleaseTarget | Number:Temperature |          | Comfort cooling AT release target                                                   |
+| temperatureHeatingLimit                  | Number:Temperature |          | Temperature Heating Limit                                                           |
+| comfortCoolingATExcess                   | Number:Time        |          | AT Excess                                                                           |
+| comfortCoolingATUndercut                 | Number:Time        |          | AT undercut                                                                         |
 
 ## Example
 
@@ -368,4 +369,4 @@ This binding was initially based on the [Novelan/Luxtronik Heat Pump Binding](ht
 Luxtronik control units have an internal webserver which serves a Java applet. This applet can be used to configure some parts of the heat pump. The applet itselves uses a socket connection to fetch and send data to the heatpump.
 This socket is also used by this binding. To get some more information on how this socket works you can check out other Luxtronik tools like [Luxtronik2 for NodeJS](https://github.com/coolchip/luxtronik2).
 
-A detailed parameter descriptions for the Java Webinterface can be found in the [Loxwiki](https://loxwiki.atlassian.net/wiki/spaces/LOX/pages/1533935933/Java+Webinterface)
+A detailed parameter description for the Java Webinterface can be found in the [Loxwiki](https://loxwiki.atlassian.net/wiki/spaces/LOX/pages/1533935933/Java+Webinterface)

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 30dbbfb8ad89b9b9202cb7acaaa3c76c55c30219..cd45e14ba65c7997d9410f9e9cb494d50c85ac81 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
@@ -159,6 +159,7 @@ public class LuxtronikHeatpumpHandler extends BaseThingHandler {
                 break;
             case CHANNEL_EINST_WK_AKT:
             case CHANNEL_EINST_BWS_AKT:
+            case CHANNEL_EINST_HZFTRL_AKT:
             case CHANNEL_EINST_KUCFTL_AKT:
             case CHANNEL_SOLLWERT_KUCFTL_AKT:
             case CHANNEL_SOLL_BWS_AKT:

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 581c1ee2c2aab095ce01c34e4471d6cc1322bdd9..56d48539fcf279c45a53a531366227aa7a940324 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
@@ -1258,6 +1258,14 @@ public enum HeatpumpChannel {
      */
     CHANNEL_BA_BW_AKT(4, "hotWaterMode", NumberItem.class, null, true, HeatpumpVisibility.BRAUWASSER),
 
+    /**
+     * Target heating return temperature if heat pump is set to fixed temperature
+     * (will directly set the target return temperature, no automatic changes depending on outside temperature)
+     * (original: Rücklauf FestwerteHK)
+     */
+    CHANNEL_EINST_HZFTRL_AKT(17, "temperatureHeatingFixedReturnTarget", NumberItem.class, SIUnits.CELSIUS, true,
+            HeatpumpVisibility.HEIZUNG),
+
     /**
      * Thermal disinfection (Monday)
      * (original: Thermische Desinfektion (Montag))

diff --git a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump.properties b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump.properties
index 4a73aec1ffb3207923e4520a1f57c0c2c5cb55a0..ac6836024ac813a86c4c79c0ae1a70836acac827 100644 (file)
--- a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump.properties
+++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump.properties
@@ -240,6 +240,7 @@ channel-type.luxtronikheatpump.temperatureCondensation.label = Condensation Temp
 channel-type.luxtronikheatpump.temperatureExhaustAir.label = Exhaust Air Temp.
 channel-type.luxtronikheatpump.temperatureExternalEnergySource.label = Sensor Ext. Energy Source
 channel-type.luxtronikheatpump.temperatureFlowTarget.label = Temp. Flow Target
+channel-type.luxtronikheatpump.temperatureHeatingFixedReturnTarget.label = Fixed Heating Target Return Temperature
 channel-type.luxtronikheatpump.temperatureHeatSourceInlet.label = Heat Source Inlet Temp.
 channel-type.luxtronikheatpump.temperatureHeatSourceInlet2.label = Temp. Sensor Heat Source Inlet 2
 channel-type.luxtronikheatpump.temperatureHeatSourceOutlet.label = Heat Source Outlet Temp.

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 41c0f6e728af006c30102f61d2b6be120ddf5c89..878961ac28ed2e48a60874fee7239a376c6e5542 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
@@ -2059,6 +2059,13 @@
                <state pattern="%.1f %unit%" min="30" max="65" step="0.5"></state>
        </channel-type>
 
+       <channel-type id="temperatureHeatingFixedReturnTarget" advanced="true">
+               <item-type>Number:Temperature</item-type>
+               <label>Fixed Heating Target Return Temperature</label>
+               <category>Temperature</category>
+               <state pattern="%.1f %unit%"></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 bc722e3d4f6e0c289259aa7b508c69cd53aa8967..46a5739ea969990a1a04f1facb5098def36b1fd3 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="temperatureHeatingFixedReturnTarget" typeId="temperatureHeatingFixedReturnTarget"/>
                        <channel id="temperatureHotWaterCoverage" typeId="temperatureHotWaterCoverage"/>
                        <channel id="temperatureHeatSourceInlet" typeId="temperatureHeatSourceInlet"/>
                        <channel id="temperatureHeatSourceOutlet" typeId="temperatureHeatSourceOutlet"/>
@@ -312,6 +313,10 @@
                        <channel id="comfortCoolingATUndercut" typeId="comfortCoolingATUndercut"/>
                </channels>
 
+               <properties>
+                       <property name="thingTypeVersion">1</property>
+               </properties>
+
                <config-description>
                        <parameter name="ipAddress" type="text" required="true">
                                <context>network-address</context>

diff --git a/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/update/instructions.xml b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/update/instructions.xml
new file mode 100644 (file)
index 0000000..1b90574
--- /dev/null
+++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/update/instructions.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<update:update-descriptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:update="https://openhab.org/schemas/update-description/v1.0.0"
+       xsi:schemaLocation="https://openhab.org/schemas/update-description/v1.0.0 https://openhab.org/schemas/update-description-1.0.0.xsd">
+
+       <thing-type uid="luxtronikheatpump:device">
+               <instruction-set targetVersion="1">
+                       <add-channel id="temperatureHeatingFixedReturnTarget">
+                               <type>Number:Temperature</type>
+                               <label>Fixed Heating Target Return Temperature</label>
+                       </add-channel>
+               </instruction-set>
+       </thing-type>
+
+</update:update-descriptions>