From 8a487d36568f013ae5c2788ca0c6473fbcfdaeec Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Thu, 14 Sep 2017 18:34:05 +0000
Subject: [PATCH] 10_ZWave.pm: fix multiChannel issues with showSetInState
 (Forum #75742)

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

diff --git a/FHEM/10_ZWave.pm b/FHEM/10_ZWave.pm
index 072646580..1b93594af 100644
--- a/FHEM/10_ZWave.pm
+++ b/FHEM/10_ZWave.pm
@@ -931,8 +931,7 @@ ZWave_Cmd($$@)
   }
 
   my $id = $hash->{nodeIdHex};
-  my $isMc = ($id =~ m/(....)/);
-  if(!$isMc) {
+  if($id !~ m/(....)/) { # not multiChannel
     if($type eq "set") {
       $cmdList{neighborUpdate} = { fmt=>"48$id",     id=>"", ctrlCmd=>1 };
       $cmdList{returnRouteAdd} = { fmt=>"46$id%02x", id=>"", ctrlCmd=>1 };
@@ -1039,6 +1038,7 @@ ZWave_Cmd($$@)
   Log3 $name, 3, "ZWave $type $name $cmd ".join(" ", @a);
 
   my ($baseClasses, $baseHash) = ($classes, $hash);
+  delete($hash->{lastChannelUsed});
   if($id =~ m/(..)(..)/) {  # Multi-Channel, encapsulate
     my ($baseId,$ch) = ($1, $2);
     $id = $baseId;
@@ -1046,6 +1046,7 @@ ZWave_Cmd($$@)
     $cmdId = "60";  # MULTI_CHANNEL
     $baseHash = $modules{ZWave}{defptr}{"$hash->{homeId} $baseId"};
     $baseClasses = AttrVal($baseHash->{NAME}, "classes", "");
+    $baseHash->{lastChannelUsed} = $name;
   }
 
   my $data;
@@ -4700,13 +4701,16 @@ ZWave_Parse($$@)
         ZWave_processSendStack($hash, "ack", $callbackid);
         readingsSingleUpdate($hash, "transmit", $lmsg, 0);
         if($iodev->{showSetInState}) {
-          my $state = ReadingsVal($hash->{NAME}, "state", "");
+          my $lCU = $hash->{lastChannelUsed};
+          my $lname = $lCU ? $lCU : $hash->{NAME};
+          my $state = ReadingsVal($lname, "state", "");
           if($state =~ m/^set_(.*)$/) {
-            readingsSingleUpdate($hash, "state", $1, 1);
-            $name = $hash->{NAME};
+            readingsSingleUpdate($defs{$lname}, "state", $1, 1);
+            $name = $lname;
           }
         }
       }
+      delete($hash->{lastChannelUsed});
       return $name;
 
     } else { # Wait for the retry timer to remove this cmd from the stack.