From ef3ac031826bd41f6ae57b921c5f73487c508402 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Sun, 10 Sep 2017 10:03:41 +0000 Subject: [PATCH] 00_ZWDongle.pm: add createNodeSec (Forum #76173) git-svn-id: https://svn.fhem.de/fhem/trunk@15039 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_ZWDongle.pm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/00_ZWDongle.pm b/fhem/FHEM/00_ZWDongle.pm index 66aed0bf1..e56b85065 100644 --- a/fhem/FHEM/00_ZWDongle.pm +++ b/fhem/FHEM/00_ZWDongle.pm @@ -35,6 +35,7 @@ my %sets = ( param => { on =>0x02, stop =>0x05, stopFailed =>0x06 } }, "createNode" => { cmd => "60%02x" }, # ZW_REQUEST_NODE_INFO + "createNodeSec" => { cmd => "60%02x" }, # ZW_REQUEST_NODE_INFO "factoryReset" => { cmd => "" }, # ZW_SET_DEFAULT "learnMode" => { cmd => "50%02x@", # ZW_SET_LEARN_MODE param => { onNw =>0x02, on =>0x01, @@ -336,7 +337,7 @@ ZWDongle_Set($@) if($type eq "removeFailedNode" || $type eq "replaceFailedNode" || - $type eq "createNode" || + $type =~ m/^createNode/ || $type eq "sendNIF") { $a[0] =~ s/^UNKNOWN_//; @@ -352,12 +353,11 @@ ZWDongle_Set($@) return "$type is unsupported by this controller"; } + delete($hash->{addSecure}); + $hash->{addSecure} = 1 if($type eq "createNodeSec"); + if($type eq "addNode") { - if($a[0] && $a[0] =~ m/sec/i) { - $hash->{addSecure} = 1; - } else { - delete($hash->{addSecure}); - } + $hash->{addSecure} = 1 if($a[0] && $a[0] =~ m/sec/i); if($a[0]) { # Remember the client for the failed message if($a[0] eq "off") { @@ -1070,13 +1070,16 @@ ZWDongle_Ready($)
  • createNode <device>
    + createNodeSec <device>
    Request the class information for the specified node, and create a FHEM device upon reception of the answer. Used to create FHEM devices for nodes included with another software or if the fhem.cfg got lost. For the node id see the get nodeList command below. Note: the node must be "alive", i.e. for battery based devices you have to press the "wakeup" button 1-2 seconds before entering this command in FHEM.
    - <device> is either device name or decimal nodeId. + <device> is either device name or decimal nodeId.
    + createNodeSec assumes a secure inclusion, see the comments for "addNode + onSec" for details.
  • factoryReset yes