From dbe1d0c4c6012e2d54c3fa53b9e30fb364ad80f7 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Mon, 16 May 2016 11:22:35 +0000 Subject: [PATCH] ZWLib: fix zwlib_parseNodeInfo (Forum #53444) git-svn-id: https://svn.fhem.de/fhem/trunk@11464 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_ZWDongle.pm | 3 +-- fhem/FHEM/ZWLib.pm | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/00_ZWDongle.pm b/fhem/FHEM/00_ZWDongle.pm index 481ce384e..cb7bac3bb 100755 --- a/fhem/FHEM/00_ZWDongle.pm +++ b/fhem/FHEM/00_ZWDongle.pm @@ -398,8 +398,7 @@ ZWDongle_Get($@) $msg = join(" ", @list); } elsif($cmd eq "nodeInfo") { ############################ - my $id = sprintf("%02x", $r[6]); - if($id eq "00") { + if($r[6] == 0) { $msg = "node $a[0] is not present"; } else { $msg = zwlib_parseNodeInfo(@r); diff --git a/fhem/FHEM/ZWLib.pm b/fhem/FHEM/ZWLib.pm index 2d0cd7a15..e4be535a2 100644 --- a/fhem/FHEM/ZWLib.pm +++ b/fhem/FHEM/ZWLib.pm @@ -207,6 +207,7 @@ zwlib_parseNodeInfo(@) my @list; my @type5 = qw( CONTROLLER STATIC_CONTROLLER SLAVE ROUTING_SLAVE); push @list, $type5[$r[5]-1] if($r[5]>0 && $r[5] <= @type5); + my $id = sprintf("%02x", $r[6]); push @list, $zw_type6{$id} if($zw_type6{$id}); push @list, ($r[2] & 0x80) ? "listening" : "sleeping"; push @list, "frequentListening:" . ($r[3] & ( 0x20 | 0x40 ));