From 9753731943e4b97f50e6b22c37d4aac8ce14374b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ren=C3=A9=20B=C3=A4recke?= <77075719+Taxifahrer@users.noreply.github.com> Date: Sun, 14 Jan 2024 21:35:01 +0100 Subject: [PATCH] [luxtronik] Add channel for fixed heating return temperature (#16218) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * 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> --- .../README.md | 43 ++++++++++--------- .../internal/LuxtronikHeatpumpHandler.java | 1 + .../internal/enums/HeatpumpChannel.java | 8 ++++ .../OH-INF/i18n/luxtronikheatpump.properties | 1 + .../main/resources/OH-INF/thing/channels.xml | 7 +++ .../resources/OH-INF/thing/thing-types.xml | 5 +++ .../resources/OH-INF/update/instructions.xml | 15 +++++++ 7 files changed, 59 insertions(+), 21 deletions(-) create mode 100644 bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/update/instructions.xml diff --git a/bundles/org.openhab.binding.luxtronikheatpump/README.md b/bundles/org.openhab.binding.luxtronikheatpump/README.md index e52b732f34..73bc4ae7ad 100644 --- 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 30dbbfb8ad..cd45e14ba6 100644 --- 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 581c1ee2c2..56d48539fc 100644 --- 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 4a73aec1ff..ac6836024a 100644 --- 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 41c0f6e728..878961ac28 100644 --- 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 @@ + + Number:Temperature + + Temperature + + + Number 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 bc722e3d4f..46a5739ea9 100644 --- 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 @@ + @@ -312,6 +313,10 @@ + + 1 + + network-address 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 index 0000000000..1b905743a3 --- /dev/null +++ b/bundles/org.openhab.binding.luxtronikheatpump/src/main/resources/OH-INF/update/instructions.xml @@ -0,0 +1,15 @@ + + + + + + + Number:Temperature + + + + + + -- 2.47.3