From 6ddf1431de95bf72655649a10c53266cb8ff1d51 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Tue, 15 Mar 2016 13:58:59 +0000 Subject: [PATCH] 00_ZWDongle.pm: accept UNKNOWN_X (Forum #50873) git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@11070 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/00_ZWDongle.pm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/FHEM/00_ZWDongle.pm b/FHEM/00_ZWDongle.pm index f80d7a296..895ab7ad8 100755 --- a/FHEM/00_ZWDongle.pm +++ b/FHEM/00_ZWDongle.pm @@ -158,11 +158,14 @@ ZWDongle_Set($@) return; } - if(($type eq "removeFailedNode" || - $type eq "replaceFailedNode" || - $type eq "sendNIF") && - $defs{$a[0]} && $defs{$a[0]}{nodeIdHex}) { - $a[0] = hex($defs{$a[0]}{nodeIdHex}); + if($type eq "removeFailedNode" || + $type eq "replaceFailedNode" || + $type eq "sendNIF") { + + $a[0] =~ s/^UNKNOWN_//; + + $a[0] = hex($defs{$a[0]}{nodeIdHex}) + if($defs{$a[0]} && $defs{$a[0]}{nodeIdHex}); } my $cmd = $sets{$type}{cmd}; @@ -241,11 +244,14 @@ ZWDongle_Get($@) return "No $cmd for dummies" if(IsDummy($name)); - if(($cmd eq "neighborList" || - $cmd eq "nodeInfo" || - $cmd eq "isFailedNode") && - $defs{$a[0]} && $defs{$a[0]}{nodeIdHex}) { - $a[0] = hex($defs{$a[0]}{nodeIdHex}); + if($cmd eq "neighborList" || + $cmd eq "nodeInfo" || + $cmd eq "isFailedNode") { + + $a[0] =~ s/^UNKNOWN_//; + + $a[0] = hex($defs{$a[0]}{nodeIdHex}) + if($defs{$a[0]} && $defs{$a[0]}{nodeIdHex}); } my $out = sprintf($gets{$cmd}, @a);