From f5c80037e4f80f7ec9066023ee2e59eb0a66dd62 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Wed, 8 Dec 2021 08:35:19 +0000
Subject: [PATCH] 10_ZWave.pm: avoid incorrect events with setReadingOnAck
 (FOrum #124576)

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

diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index 4e48fa6aa..3e2805e7a 100644
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -1023,7 +1023,7 @@ ZWave_Cmd($$@)
   my ($type, $hash, @a) = @_;
   return "no $type argument specified" if(int(@a) < 2);
   my $name = shift(@a);
-  my $fullCmd = $type." ".join(" ",@a);
+  my $fullCmd = "$name $type ".join(" ",@a);
   my $cmd  = shift(@a);
 
   # Collect the commands from the distinct classes
@@ -3973,7 +3973,7 @@ ZWave_secAddToSendStack($$;$)
   my $id = $hash->{nodeIdHex};
   my $len = sprintf("%02x", (length($cmd)-2)/2+1);
   my $cmdEf  = (AttrVal($name, "noExplorerFrames", 0) == 0 ? "25" : "05");
-  my $data = "13$id$len$cmd$cmdEf" . ZWave_callbackId($hash, $cmdTxt);
+  my $data = "13$id$len$cmd$cmdEf" . ZWave_callbackId($hash, "$name $cmdTxt");
   ZWave_addToSendStack($hash, "set", $data);
 }
 
@@ -5235,9 +5235,9 @@ ZWave_Parse($$@)
             my $ackCmd = $zwave_cbid2cmd{$callbackid};
             if($ackCmd) {
               #Log 1, "ACK: $callbackid => $ackCmd";
-              my ($type, $reading, $val) = split(" ", $ackCmd, 3);
-              readingsBulkUpdate($lhash, $reading, $val, 1) 
-                  if($type eq "set" && defined($val));
+              my ($ackName, $type, $reading, $val) = split(" ", $ackCmd, 3);
+              readingsBulkUpdate($lhash, $reading, $val, 1)      #124576
+                  if($ackName eq $lname && $type eq "set" && defined($val));
               $name = $lname;
             }
           }