demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-addons synced 2026-07-29 12:34:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated and signed off version of Lambda Heat Pump (#19835)

Browse Source 
Signed-off-by: Christian Koch <78686276+chilobo@users.noreply.github.com>
This commit is contained in:
Christian Koch
2025-12-23 12:58:27 +01:00
committed by GitHub
parent d9eb805d1d
commit b6dc50cbb8
8 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.binding.modbus.lambda/README.md
+2
View File
@@ -125,6 +125,8 @@ This group contains general operational information about the heat pump itself.
| heat-pump-relais-state | Number:Temperature | true | Heatpump Relais State for 2nd heating stage |
| heat-pump-vdae | Number:Energy | true | Accumulated electrical energy consumption of compressor unit |
| heat-pump-vdaq | Number:Energy | true | Accumulated thermal energy output of compressor unit |
| heat-pump-vdae-swap | Number:Energy | true | Accumulated electrical energy consumption of compressor unit (DWord swapped) |
| heat-pump-vdaq-swap | Number:Energy | true | Accumulated thermal energy output of compressor unit (DWord swapped) |
### Boiler Group
bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/LambdaBindingConstants.java
+2
View File
@@ -88,6 +88,8 @@ public class LambdaBindingConstants {
public static final String CHANNEL_HEAT_PUMP_RELAIS_STATE = "heat-pump-relais-state";
public static final String CHANNEL_HEAT_PUMP_VDAE = "heat-pump-vdae";
public static final String CHANNEL_HEAT_PUMP_VDAQ = "heat-pump-vdaq";
public static final String CHANNEL_HEAT_PUMP_VDAE_SWAP = "heat-pump-vdae-swap";
public static final String CHANNEL_HEAT_PUMP_VDAQ_SWAP = "heat-pump-vdaq-swap";
// Boiler
public static final String CHANNEL_BOILER_ERROR_NUMBER = "boiler-error-number";
bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/dto/HeatpumpBlock.java
+2
View File
@@ -42,4 +42,6 @@ public class HeatpumpBlock {
public int heatpumpRelaisState;
public long heatpumpVdAE;
public long heatpumpVdAQ;
public long heatpumpVdAEswap;
public long heatpumpVdAQswap;
}
bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/handler/HeatpumpHandler.java
+4
View File
@@ -451,6 +451,10 @@ public class HeatpumpHandler extends BaseThingHandler {
getScaled(block.heatpumpVdAE, KILOWATT_HOUR, -3.0));
updateState(channelUID(GROUP_HEAT_PUMP, CHANNEL_HEAT_PUMP_VDAQ),
getScaled(block.heatpumpVdAQ, KILOWATT_HOUR, -3.0));
updateState(channelUID(GROUP_HEAT_PUMP, CHANNEL_HEAT_PUMP_VDAE_SWAP),
getScaled(block.heatpumpVdAEswap, KILOWATT_HOUR, -3.0));
updateState(channelUID(GROUP_HEAT_PUMP, CHANNEL_HEAT_PUMP_VDAQ_SWAP),
getScaled(block.heatpumpVdAQswap, KILOWATT_HOUR, -3.0));
resetCommunicationError();
}
bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/parser/AbstractBaseParser.java
+9
View File
@@ -154,4 +154,13 @@ public class AbstractBaseParser {
protected Long extractInt32(ModbusRegisterArray raw, int index, long def) {
return Objects.requireNonNull(extractOptionalInt32(raw, index).orElse(def));
}
protected Optional<Long> extractOptionalInt32Swap(ModbusRegisterArray raw, int index) {
return ModbusBitUtilities.extractStateFromRegisters(raw, index, ValueType.INT32_SWAP)
.map(DecimalType::longValue).filter(value -> value != 0);
}
protected Long extractInt32Swap(ModbusRegisterArray raw, int index, long def) {
return Objects.requireNonNull(extractOptionalInt32Swap(raw, index).orElse(def));
}
}
bundles/org.openhab.binding.modbus.lambda/src/main/java/org/openhab/binding/modbus/lambda/internal/parser/HeatpumpBlockParser.java
+2
View File
@@ -50,6 +50,8 @@ public class HeatpumpBlockParser extends AbstractBaseParser {
block.heatpumpRelaisState = extractInt16(raw, 19, (short) 0);
block.heatpumpVdAE = extractInt32(raw, 20, (long) 0);
block.heatpumpVdAQ = extractInt32(raw, 22, (long) 0);
block.heatpumpVdAEswap = extractInt32Swap(raw, 20, (long) 0);
block.heatpumpVdAQswap = extractInt32Swap(raw, 22, (long) 0);
return block;
}
}
bundles/org.openhab.binding.modbus.lambda/src/main/resources/OH-INF/i18n/lambda.properties
+2
View File
@@ -111,6 +111,8 @@ channel-type.modbus.heat-pump-request-heat-sink-channel.label = Heatpump request
channel-type.modbus.heat-pump-relais-state-channel.label = Heatpump Relais State
channel-type.modbus.heat-pump-vdae-channel.label = Heatpump VdA E
channel-type.modbus.heat-pump-vdaq-channel.label = Heatpump VdA Q
channel-type.modbus.heat-pump-vdae-swap-channel.label = Heatpump VdA E (DWord swapped)
channel-type.modbus.heat-pump-vdaq-swap-channel.label = Heatpump VdA Q (DWord swapped)
# Boiler
channel-type.modbus.boiler-error-number-channel.label = Boiler Error Number
bundles/org.openhab.binding.modbus.lambda/src/main/resources/OH-INF/thing/heat-pump-thing-types.xml
+14
View File
@@ -66,6 +66,8 @@
<channel id="heatpump-relais-state" typeId="heatpump-relais-state-channel"/>
<channel id="heat-pump-vdae" typeId="heat-pump-vdae"/>
<channel id="heat-pump-vdaq" typeId="heat-pump-vdaq"/>
<channel id="heat-pump-vdae-swap" typeId="heat-pump-vdae-swap"/>
<channel id="heat-pump-vdaq-swap" typeId="heat-pump-vdaq-swap"/>
</channels>
</channel-group-type>
@@ -265,4 +267,16 @@
<state readOnly="true"/>
</channel-type>
<channel-type id="heat-pump-vdae-swap">
<item-type>Number:Energy</item-type>
<label>Heatpump VdA E since last reset (DWord swapped)</label>
<state readOnly="true"/>
</channel-type>
<channel-type id="heat-pump-vdaq-swap">
<item-type>Number:Energy</item-type>
<label>Heatpump VdA Q since last reset (DWord swapped)</label>
<state readOnly="true"/>
</channel-type>
</thing:thing-descriptions>