Skip to content

Commit

Permalink
[luxtronikheatpump] Adjust previously unknown channels with new infor…
Browse files Browse the repository at this point in the history 
…mation

Signed-off-by: Stefan Giehl <[email protected]>
  • Loading branch information
@sgiehl
sgiehl committed Jan 19, 2025
1 parent 241829d commit 480a09d
Show file tree
Hide file tree
Showing 8 changed files with 431 additions and 311 deletions.
467 changes: 233 additions & 234 deletions bundles/org.openhab.binding.luxtronikheatpump/README.md
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions ...tpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/ChannelUpdaterJob.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,11 @@ public static Map<String, Object> getProperties(Integer[] heatpumpValues) {
properties.put("broadcastAddress", transformIpAddress(heatpumpValues[93]));
properties.put("gateway", transformIpAddress(heatpumpValues[94]));

if (heatpumpValues.length >= 258 && heatpumpValues[258] > 0) {
// Only set property if RBE unit is installed
properties.put("RbeVersion", heatpumpValues[258]);
}

return properties;
}

Expand Down
32 changes: 19 additions & 13 deletions ...p/src/main/java/org/openhab/binding/luxtronikheatpump/internal/enums/HeatpumpChannel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1199,18 +1199,18 @@ public enum HeatpumpChannel {
// code. The following channels are determined based on their values and which value
// they match on a heat pump

CHANNEL_232(232, "channel232", NumberItem.class, null, false, null),
CHANNEL_233(233, "channel233", NumberItem.class, null, false, null),
CHANNEL_232(232, "temperatureVapourisation", NumberItem.class, SIUnits.CELSIUS, false, null),
CHANNEL_233(233, "temperatureLiquefaction", NumberItem.class, SIUnits.CELSIUS, false, null),
CHANNEL_234(234, "channel234", NumberItem.class, null, false, null),
CHANNEL_235(235, "channel235", NumberItem.class, null, false, null),
CHANNEL_236(236, "frequencyCompressorTarget", NumberItem.class, Units.HERTZ, false, null),
CHANNEL_237(237, "channel237", NumberItem.class, null, false, null),
CHANNEL_238(238, "channel238", NumberItem.class, null, false, null),
CHANNEL_239(239, "channel239", NumberItem.class, null, false, null),
CHANNEL_240(240, "channel240", NumberItem.class, null, false, null),
CHANNEL_241(241, "channel241", NumberItem.class, null, false, null),
CHANNEL_242(242, "channel242", NumberItem.class, null, false, null),
CHANNEL_243(243, "channel243", NumberItem.class, null, false, null),
CHANNEL_237(237, "frequencyCompressorMin", NumberItem.class, Units.HERTZ, false, null),
CHANNEL_238(238, "frequencyCompressorMax", NumberItem.class, Units.HERTZ, false, null),
CHANNEL_239(239, "temperatureVBOTarget", NumberItem.class, Units.KELVIN, false, null),
CHANNEL_240(240, "temperatureVBO", NumberItem.class, Units.KELVIN, false, null),
CHANNEL_241(241, "controlSignalHeatingCirculationPump", NumberItem.class, Units.PERCENT, false, null),
CHANNEL_242(242, "temperatureHeatingCirculationPumpTarget", NumberItem.class, Units.KELVIN, false, null),
CHANNEL_243(243, "temperatureHeatingCirculationPump", NumberItem.class, Units.KELVIN, false, null),
CHANNEL_244(244, "channel244", NumberItem.class, null, false, null),
CHANNEL_245(245, "channel245", NumberItem.class, null, false, null),
CHANNEL_246(246, "channel246", NumberItem.class, null, false, null),
Expand All @@ -1219,15 +1219,21 @@ public enum HeatpumpChannel {
CHANNEL_249(249, "channel249", NumberItem.class, null, false, null),
CHANNEL_250(250, "channel250", NumberItem.class, null, false, null),
CHANNEL_251(251, "channel251", NumberItem.class, null, false, null),
CHANNEL_252(252, "channel252", NumberItem.class, null, false, null),
CHANNEL_252(252, "temperatureHotGasMax", NumberItem.class, SIUnits.CELSIUS, false, null),
CHANNEL_253(253, "channel253", NumberItem.class, null, false, null),
CHANNEL_254(254, "flowRateHeatSource2", NumberItem.class, Units.LITRE_PER_MINUTE, false, null),
CHANNEL_255(255, "channel255", NumberItem.class, null, false, null),
CHANNEL_256(256, "channel256", NumberItem.class, null, false, null),
CHANNEL_257(257, "heatingPowerActualValue", NumberItem.class, Units.WATT, false, null),
CHANNEL_258(258, "channel258", NumberItem.class, null, false, null),
CHANNEL_259(259, "channel259", NumberItem.class, null, false, null),
CHANNEL_260(260, "channel260", NumberItem.class, null, false, null),

/**
* Version RBE
* handled as property
*/
// CHANNEL_258(258, "versionRBE", NumberItem.class, null, false, null),

CHANNEL_259(259, "channel259", SwitchItem.class, null, false, null),
CHANNEL_260(260, "timeCoolingRelease", NumberItem.class, Units.SECOND, false, null),

// Changeable Parameters
// https://www.loxwiki.eu/display/LOX/Java+Webinterface?preview=/13306044/13307658/3003.txt
Expand Down
24 changes: 11 additions & 13 deletions ...hab.binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,8 @@ addon.luxtronikheatpump.description = This is the binding for a Heatpump with Lu

thing-type.luxtronikheatpump.heatpump.label = Heatpump with Luxtronik Control
thing-type.luxtronikheatpump.heatpump.description = Integrates a heatpump with a Luxtronik control.
thing-type.luxtronikheatpump.heatpump.channel.channel232.label = Channel 232
thing-type.luxtronikheatpump.heatpump.channel.channel233.label = Channel 233
thing-type.luxtronikheatpump.heatpump.channel.channel234.label = Channel 234
thing-type.luxtronikheatpump.heatpump.channel.channel235.label = Channel 235
thing-type.luxtronikheatpump.heatpump.channel.channel237.label = Channel 237
thing-type.luxtronikheatpump.heatpump.channel.channel238.label = Channel 238
thing-type.luxtronikheatpump.heatpump.channel.channel239.label = Channel 239
thing-type.luxtronikheatpump.heatpump.channel.channel240.label = Channel 240
thing-type.luxtronikheatpump.heatpump.channel.channel241.label = Channel 241
thing-type.luxtronikheatpump.heatpump.channel.channel242.label = Channel 242
thing-type.luxtronikheatpump.heatpump.channel.channel243.label = Channel 243
thing-type.luxtronikheatpump.heatpump.channel.channel244.label = Channel 244
thing-type.luxtronikheatpump.heatpump.channel.channel245.label = Channel 245
thing-type.luxtronikheatpump.heatpump.channel.channel246.label = Channel 246
Expand All @@ -26,13 +17,9 @@ thing-type.luxtronikheatpump.heatpump.channel.channel248.label = Channel 248
thing-type.luxtronikheatpump.heatpump.channel.channel249.label = Channel 249
thing-type.luxtronikheatpump.heatpump.channel.channel250.label = Channel 250
thing-type.luxtronikheatpump.heatpump.channel.channel251.label = Channel 251
thing-type.luxtronikheatpump.heatpump.channel.channel252.label = Channel 252
thing-type.luxtronikheatpump.heatpump.channel.channel253.label = Channel 253
thing-type.luxtronikheatpump.heatpump.channel.channel255.label = Channel 255
thing-type.luxtronikheatpump.heatpump.channel.channel256.label = Channel 256
thing-type.luxtronikheatpump.heatpump.channel.channel258.label = Channel 258
thing-type.luxtronikheatpump.heatpump.channel.channel259.label = Channel 259
thing-type.luxtronikheatpump.heatpump.channel.channel260.label = Channel 260

# thing types config

Expand Down Expand Up @@ -63,6 +50,7 @@ channel-type.luxtronikheatpump.comfortCoolingMode.state.option.1 = Auto
channel-type.luxtronikheatpump.compressorIdleTime.label = Compressor Idle Time
channel-type.luxtronikheatpump.compressorSpeed.label = Compressor Speed
channel-type.luxtronikheatpump.controlSignalCirculatingPump.label = Heating Circulating Pump Power
channel-type.luxtronikheatpump.controlSignalHeatingCirculationPump.label = Control Signal HUP
channel-type.luxtronikheatpump.coolingRelease.label = Release Cooling
channel-type.luxtronikheatpump.currentTimestamp.label = Current Time of Heat Pump
channel-type.luxtronikheatpump.errorCode0.label = Error Code Error 0
Expand All @@ -81,6 +69,8 @@ channel-type.luxtronikheatpump.flowRateHeatSource.label = Flow Rate Heat Source
channel-type.luxtronikheatpump.flowRateHeatSource2.label = Flow Rate Heat Source
channel-type.luxtronikheatpump.fourWayValve.label = Four-way Valve
channel-type.luxtronikheatpump.frequencyCompressor.label = Compressor Frequency
channel-type.luxtronikheatpump.frequencyCompressorMax.label = Compressor Max Frequency
channel-type.luxtronikheatpump.frequencyCompressorMin.label = Compressor Min Frequency
channel-type.luxtronikheatpump.frequencyCompressorTarget.label = Compressor Target Frequency
channel-type.luxtronikheatpump.heatMeterFlowRate.label = Heat Meter Flow Rate
channel-type.luxtronikheatpump.heatMeterHeating.label = Heat Meter Heating
Expand Down Expand Up @@ -247,9 +237,12 @@ channel-type.luxtronikheatpump.temperatureHeatSourceOutlet.label = Heat Source O
channel-type.luxtronikheatpump.temperatureHeatingCircuitFlow.label = Flow Temp. Heating Circuit
channel-type.luxtronikheatpump.temperatureHeatingCircuitReturn.label = Return Temp. Heating Circuit
channel-type.luxtronikheatpump.temperatureHeatingCircuitReturnTarget.label = Return Temp. Target Heating Circuit
channel-type.luxtronikheatpump.temperatureHeatingCirculationPump.label = Temperature HUP
channel-type.luxtronikheatpump.temperatureHeatingCirculationPumpTarget.label = Temperature Target HUP
channel-type.luxtronikheatpump.temperatureHeatingLimit.label = Temperature Heating Limit
channel-type.luxtronikheatpump.temperatureHeatingParallelShift.label = Heating Temp. (Offset)
channel-type.luxtronikheatpump.temperatureHotGas.label = Hot Gas Temperature
channel-type.luxtronikheatpump.temperatureHotGasMax.label = Hot Gas Max Temperature
channel-type.luxtronikheatpump.temperatureHotGas2.label = Hot Gas Temp. Sensor 2
channel-type.luxtronikheatpump.temperatureHotWater.label = Hot Water Actual Temp.
channel-type.luxtronikheatpump.temperatureHotWaterCoverage.label = Coverage Hot Water Temp.
Expand All @@ -260,6 +253,7 @@ channel-type.luxtronikheatpump.temperatureIntakeCompressor2.label = Intake Temp.
channel-type.luxtronikheatpump.temperatureIntakeEVI.label = Intake Temp. EVI
channel-type.luxtronikheatpump.temperatureIntakeEvaporator2.label = Intake Temp. Evaporator 2
channel-type.luxtronikheatpump.temperatureLiquidEEV.label = Liquid Temp. EEV
channel-type.luxtronikheatpump.temperatureLiquefaction.label = Temperature Liquefaction
channel-type.luxtronikheatpump.temperatureMixingCircuit1Flow.label = Mixing Circuit 1 Flow Temp.
channel-type.luxtronikheatpump.temperatureMixingCircuit1FlowTarget.label = Mixing Circuit 1 Flow Target Temp.
channel-type.luxtronikheatpump.temperatureMixingCircuit2Flow.label = Mixing Circuit 2 Flow Temp.
Expand All @@ -285,6 +279,9 @@ channel-type.luxtronikheatpump.temperatureSolarTank.label = Solar Tank Sensor
channel-type.luxtronikheatpump.temperatureSuctionCompressor.label = Temp. Suction Compressor
channel-type.luxtronikheatpump.temperatureSuctionEvaporator.label = Temp. Suction Evaporator
channel-type.luxtronikheatpump.temperatureSupplyAir.label = Supply Air Temp.
channel-type.luxtronikheatpump.temperatureVBO.label = Temperature VBO
channel-type.luxtronikheatpump.temperatureVBOTarget.label = Temperature VBO Target
channel-type.luxtronikheatpump.temperatureVapourisation.label = Temperature Vapourisation
channel-type.luxtronikheatpump.thermalDisinfectionFriday.label = Thermal Disinfection (Fri)
channel-type.luxtronikheatpump.thermalDisinfectionMonday.label = Thermal Disinfection (Mon)
channel-type.luxtronikheatpump.thermalDisinfectionPermanent.label = Thermal Disinfection (Permanent)
Expand All @@ -293,6 +290,7 @@ channel-type.luxtronikheatpump.thermalDisinfectionSunday.label = Thermal Disinfe
channel-type.luxtronikheatpump.thermalDisinfectionThursday.label = Thermal Disinfection (Thu)
channel-type.luxtronikheatpump.thermalDisinfectionTuesday.label = Thermal Disinfection (Tue)
channel-type.luxtronikheatpump.thermalDisinfectionWednesday.label = Thermal Disinfection (Wed)
channel-type.luxtronikheatpump.timeCoolingRelease.label = Cooling Release Time
channel-type.luxtronikheatpump.timeHotWaterLock.label = Hot Water Lock
channel-type.luxtronikheatpump.timeLockSecondHotGasCompressor.label = Lock 2nd Compressor Hot Gas
channel-type.luxtronikheatpump.timeUntilDefrost.label = Time until Defrost
Expand Down
25 changes: 12 additions & 13 deletions ....binding.luxtronikheatpump/src/main/resources/OH-INF/i18n/luxtronikheatpump_de.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,8 @@ addon.luxtronikheatpump.description = Dieses Binding integriert Wärmepumpen mit

thing-type.luxtronikheatpump.heatpump.label = Wärmepumpe mit Luxtronik-Steuerung
thing-type.luxtronikheatpump.heatpump.description = Integriert eine Wärmepumpe mit einer Luxtronik-Steuerung.
thing-type.luxtronikheatpump.heatpump.channel.channel232.label = Kanal 232
thing-type.luxtronikheatpump.heatpump.channel.channel233.label = Kanal 233
thing-type.luxtronikheatpump.heatpump.channel.channel234.label = Kanal 234
thing-type.luxtronikheatpump.heatpump.channel.channel235.label = Kanal 235
thing-type.luxtronikheatpump.heatpump.channel.channel237.label = Kanal 237
thing-type.luxtronikheatpump.heatpump.channel.channel238.label = Kanal 238
thing-type.luxtronikheatpump.heatpump.channel.channel239.label = Kanal 239
thing-type.luxtronikheatpump.heatpump.channel.channel240.label = Kanal 240
thing-type.luxtronikheatpump.heatpump.channel.channel241.label = Kanal 241
thing-type.luxtronikheatpump.heatpump.channel.channel242.label = Kanal 242
thing-type.luxtronikheatpump.heatpump.channel.channel243.label = Kanal 243
thing-type.luxtronikheatpump.heatpump.channel.channel244.label = Kanal 244
thing-type.luxtronikheatpump.heatpump.channel.channel245.label = Kanal 245
thing-type.luxtronikheatpump.heatpump.channel.channel246.label = Kanal 246
Expand All @@ -26,13 +17,9 @@ thing-type.luxtronikheatpump.heatpump.channel.channel248.label = Kanal 248
thing-type.luxtronikheatpump.heatpump.channel.channel249.label = Kanal 249
thing-type.luxtronikheatpump.heatpump.channel.channel250.label = Kanal 250
thing-type.luxtronikheatpump.heatpump.channel.channel251.label = Kanal 251
thing-type.luxtronikheatpump.heatpump.channel.channel252.label = Kanal 252
thing-type.luxtronikheatpump.heatpump.channel.channel253.label = Kanal 253
thing-type.luxtronikheatpump.heatpump.channel.channel255.label = Kanal 255
thing-type.luxtronikheatpump.heatpump.channel.channel256.label = Kanal 256
thing-type.luxtronikheatpump.heatpump.channel.channel258.label = Kanal 258
thing-type.luxtronikheatpump.heatpump.channel.channel259.label = Kanal 259
thing-type.luxtronikheatpump.heatpump.channel.channel260.label = Kanal 260

# thing types config

Expand Down Expand Up @@ -63,6 +50,7 @@ channel-type.luxtronikheatpump.comfortCoolingMode.state.option.1 = Auto
channel-type.luxtronikheatpump.compressorIdleTime.label = Verdichter-Standzeit
channel-type.luxtronikheatpump.compressorSpeed.label = Verdichterdrehzahl
channel-type.luxtronikheatpump.controlSignalCirculatingPump.label = Steuersignal Umwälzpumpe
channel-type.luxtronikheatpump.controlSignalHeatingCirculationPump.label = Steuersignal HUP
channel-type.luxtronikheatpump.coolingRelease.label = Freigabe Kühlung
channel-type.luxtronikheatpump.currentTimestamp.label = Aktuelle Zeit der Wärmepumpe
channel-type.luxtronikheatpump.errorCode0.label = Fehlercode Fehler 0 im Speicher
Expand All @@ -81,6 +69,8 @@ channel-type.luxtronikheatpump.flowRateHeatSource.label = Durchfluss Wärmequell
channel-type.luxtronikheatpump.flowRateHeatSource2.label = Durchfluss Wärmequelle
channel-type.luxtronikheatpump.fourWayValve.label = Vierwegeventil
channel-type.luxtronikheatpump.frequencyCompressor.label = Verdichterfrequenz
channel-type.luxtronikheatpump.frequencyCompressorMax.label = Verdichterfrequenz Max
channel-type.luxtronikheatpump.frequencyCompressorMin.label = Verdichterfrequenz Min
channel-type.luxtronikheatpump.frequencyCompressorTarget.label = Verdichterfrequenz Sollwert
channel-type.luxtronikheatpump.heatMeterFlowRate.label = Wärmemengenzähler Durchfluss
channel-type.luxtronikheatpump.heatMeterHeating.label = Wärmemengenzähler Heizung
Expand Down Expand Up @@ -241,14 +231,18 @@ channel-type.luxtronikheatpump.temperatureExhaustAir.label = Ablufttemp.
channel-type.luxtronikheatpump.temperatureExternalEnergySource.label = Fühler externe Energiequelle
channel-type.luxtronikheatpump.temperatureFlowTarget.label = Temp. Vorlauf Soll
channel-type.luxtronikheatpump.temperatureHeatSourceInlet.label = Wärmequellen-Eintrittstemp.
channel-type.luxtronikheatpump.temperatureHeatingFixedReturnTarget.label = Feste Rücklauf-Soll-Temp. Heizkreis
channel-type.luxtronikheatpump.temperatureHeatSourceInlet2.label = Temp.-Fühler Wärmequelleneintritt 2
channel-type.luxtronikheatpump.temperatureHeatSourceOutlet.label = Wärmequellen-Austrittstemp.
channel-type.luxtronikheatpump.temperatureHeatingCircuitFlow.label = Vorlauftemp. Heizkreis
channel-type.luxtronikheatpump.temperatureHeatingCircuitReturn.label = Rücklauftemp. Heizkreis
channel-type.luxtronikheatpump.temperatureHeatingCircuitReturnTarget.label = Rücklauf-Soll Heizkreis
channel-type.luxtronikheatpump.temperatureHeatingCirculationPump.label = Temperatur HUP
channel-type.luxtronikheatpump.temperatureHeatingCirculationPumpTarget.label = Solltemperatur HUP
channel-type.luxtronikheatpump.temperatureHeatingLimit.label = Temperatur Heizgrenze
channel-type.luxtronikheatpump.temperatureHeatingParallelShift.label = Heizung Temp. (Parallelverschiebung)
channel-type.luxtronikheatpump.temperatureHotGas.label = Heißgastemp.
channel-type.luxtronikheatpump.temperatureHotGasMax.label = Heißgastemp. Max
channel-type.luxtronikheatpump.temperatureHotGas2.label = Temp.-Fühler Heißgas 2
channel-type.luxtronikheatpump.temperatureHotWater.label = Warmwasser Ist-Temp.
channel-type.luxtronikheatpump.temperatureHotWaterCoverage.label = Warmwasser Deckung WP
Expand All @@ -259,6 +253,7 @@ channel-type.luxtronikheatpump.temperatureIntakeCompressor2.label = Ansaugtemp.
channel-type.luxtronikheatpump.temperatureIntakeEVI.label = Ansaugtemp. EVI
channel-type.luxtronikheatpump.temperatureIntakeEvaporator2.label = Ansaugtemp. Verdampfer 2
channel-type.luxtronikheatpump.temperatureLiquidEEV.label = Flüssigtemp. EEV (elektronisches Expansionsventil)
channel-type.luxtronikheatpump.temperatureLiquefaction.label = Temperatur Verglüssiger
channel-type.luxtronikheatpump.temperatureMixingCircuit1Flow.label = Mischkreis 1 Vorlauftemp.
channel-type.luxtronikheatpump.temperatureMixingCircuit1FlowTarget.label = Mischkreis 1 Vorlauf-Soll-Temp.
channel-type.luxtronikheatpump.temperatureMixingCircuit2Flow.label = Mischkreis 2 Vorlauftemp.
Expand All @@ -284,6 +279,9 @@ channel-type.luxtronikheatpump.temperatureSolarTank.label = Fühler Solarspeiche
channel-type.luxtronikheatpump.temperatureSuctionCompressor.label = Temp. Ansaug Verdichter
channel-type.luxtronikheatpump.temperatureSuctionEvaporator.label = Temp. Ansaug Verdampfer
channel-type.luxtronikheatpump.temperatureSupplyAir.label = Zulufttemp.
channel-type.luxtronikheatpump.temperatureVBO.label = Temperatur VBO
channel-type.luxtronikheatpump.temperatureVBOTarget.label = Solltemperatur VBO
channel-type.luxtronikheatpump.temperatureVapourisation.label = Temperatur Verdampfer
channel-type.luxtronikheatpump.thermalDisinfectionFriday.label = Thermische Desinfektion (Fr)
channel-type.luxtronikheatpump.thermalDisinfectionMonday.label = Thermische Desinfektion (Mo)
channel-type.luxtronikheatpump.thermalDisinfectionPermanent.label = Thermische Desinfektion (Dauerbetrieb)
Expand All @@ -292,6 +290,7 @@ channel-type.luxtronikheatpump.thermalDisinfectionSunday.label = Thermische Desi
channel-type.luxtronikheatpump.thermalDisinfectionThursday.label = Thermische Desinfektion (Do)
channel-type.luxtronikheatpump.thermalDisinfectionTuesday.label = Thermische Desinfektion (Di)
channel-type.luxtronikheatpump.thermalDisinfectionWednesday.label = Thermische Desinfektion (Mi)
channel-type.luxtronikheatpump.timeCoolingRelease.label = Zeit Freigabe Kühlung
channel-type.luxtronikheatpump.timeHotWaterLock.label = Sperre Warmwasser
channel-type.luxtronikheatpump.timeLockSecondHotGasCompressor.label = Sperre zweiter Verdichter Heißgas
channel-type.luxtronikheatpump.timeUntilDefrost.label = Zeit bis Abtauen
Expand Down
Loading

0 comments on commit 480a09d

Please sign in to comment.