Skip to content

[modbus.lambda] Fix endianness for VdAE and VdAQ 32-bit registers #19749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 2 commits into from
Closed

[modbus.lambda] Fix endianness for VdAE and VdAQ 32-bit registers #19749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2d59c6
Initial plan
Copilot Dec 4, 2025
d7f49f4
Fix endianness for heatpumpVdAE and heatpumpVdAQ by using INT32_SWAP
Copilot Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...a/src/main/java/org/openhab/binding/modbus/lambda/internal/parser/AbstractBaseParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,13 @@ protected Long extractUInt32(ModbusRegisterArray raw, int index, long def) {
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));
}
}
4 changes: 2 additions & 2 deletions .../src/main/java/org/openhab/binding/modbus/lambda/internal/parser/HeatpumpBlockParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ public HeatpumpBlock parse(ModbusRegisterArray raw) {
block.heatpumpRequestTReturn = extractInt16(raw, 17, (short) 0);
block.heatpumpRequestHeatSink = extractInt16(raw, 18, (short) 0);
block.heatpumpRelaisState = extractInt16(raw, 19, (short) 0);
block.heatpumpVdAE = extractInt32(raw, 20, (long) 0);
block.heatpumpVdAQ = extractInt32(raw, 22, (long) 0);
block.heatpumpVdAE = extractInt32Swap(raw, 20, (long) 0);
block.heatpumpVdAQ = extractInt32Swap(raw, 22, (long) 0);
return block;
}
}