mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix for DIF_INT24/DIF_INT48 (see

Browse Source 
https://forum.fhem.de/index.php?msg=1318451)


git-svn-id: https://svn.fhem.de/fhem/trunk@29104 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
kaihs
2024-08-25 09:38:32 +00:00
parent 3f2541b54b
commit d65d4b6104
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/FHEM/WMBus.pm
View File

@@ -1647,17 +1647,21 @@ sub decodePayload($$) {
} elsif ($dataBlock->{dataField} == DIF_INT24) { } elsif ($dataBlock->{dataField} == DIF_INT24) {
my @bytes = unpack('CCC', substr($payload, $offset, 3)); my @bytes = unpack('CCC', substr($payload, $offset, 3));
$offset += 3; $offset += 3;
$value = $bytes[0] + $bytes[1] << 8 + $bytes[2] << 16; $value = $bytes[0] + ($bytes[1] << 8) + ($bytes[2] << 16);
if ($bytes[2] & 0x80) {
# two's complement # two's complement
$value = ~$value + 1; $value -= (1 << 24);
}
} elsif ($dataBlock->{dataField} == DIF_INT32) { } elsif ($dataBlock->{dataField} == DIF_INT32) {
$value = unpack('l<', substr($payload, $offset, 4)); $value = unpack('l<', substr($payload, $offset, 4));
$offset += 4; $offset += 4;
} elsif ($dataBlock->{dataField} == DIF_INT48) { } elsif ($dataBlock->{dataField} == DIF_INT48) {
my @words = unpack('vvv', substr($payload, $offset, 6)); my @words = unpack('vvv', substr($payload, $offset, 6));
$value = $words[0] + ($words[1] << 16) + ($words[2] << 32); $value = $words[0] + ($words[1] << 16) + ($words[2] << 32);
if ($words[2] & 0x8000) {
# two's complement # two's complement
$value = ~$value + 1; $value -= (1 << 48);
}
$offset += 6; $offset += 6;
} elsif ($dataBlock->{dataField} == DIF_INT64) { } elsif ($dataBlock->{dataField} == DIF_INT64) {
$value = unpack('q<', substr($payload, $offset, 8)); $value = unpack('q<', substr($payload, $offset, 8));