From d65d4b6104fe2e54e0413d5c1baeed0d6a92e02a Mon Sep 17 00:00:00 2001
From: kaihs <kaihs@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Sun, 25 Aug 2024 09:38:32 +0000
Subject: [PATCH] bug fix for DIF_INT24/DIF_INT48 (see
 https://forum.fhem.de/index.php?msg=1318451)

git-svn-id: https://svn.fhem.de/fhem/trunk@29104 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/WMBus.pm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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