public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[dsmr] Fix payload length calculation for Smarty meters (#11328)

Browse Source 
Fixes #10932
Supersedes #10933 and adds a unit test.

Also-by: Alexander Hotz <alex.hotz@gmail.com>
Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
This commit is contained in:
Hilbrand Bouwkamp
2021-09-30 22:59:54 +02:00
committed by GitHub
parent 46e1b675cb
commit 1b80f1d492
3 changed files with 96 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/SmartyDecrypter.java
View File

@@ -79,7 +79,7 @@ public class SmartyDecrypter implements TelegramParser {
private int ivLength;
private int dataLength;
private boolean lenientMode;
private P1TelegramListener telegramListener;
private final P1TelegramListener telegramListener;
/**
* Constructor.
@@ -140,7 +140,7 @@ public class SmartyDecrypter implements TelegramParser {
break;
case READ_PAYLOAD_LENGTH:
dataLength <<= 8;
dataLength |= rawInput;
dataLength |= rawInput & 0xFF;
if (currentBytePosition >= changeToNextStateAt) {
state = State.READ_SEPARATOR_30;
changeToNextStateAt++;