FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 23:06:37 +00:00
Code Issues Releases Wiki Activity

00_ZWDongle.pm: change addNode params to be "drowpdown" ready (Forum #46977)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10406 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-01-08 09:21:57 +00:00
parent 16ea9c00d6
commit 49bc7ba977
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fhem/FHEM/00_ZWDongle.pm
View File

@ -22,7 +22,8 @@ sub ZWDongle_ProcessSendStack($);
# https://bitbucket.org/bradsjm/aeonzstickdriver # https://bitbucket.org/bradsjm/aeonzstickdriver
my %sets = ( my %sets = (
"addNode" => { cmd => "4a%02x@", # ZW_ADD_NODE_TO_NETWORK' "addNode" => { cmd => "4a%02x@", # ZW_ADD_NODE_TO_NETWORK'
param => {nwOn=>0xc1, on=>0x81, off=>0x05 } }, param => { nwOn=>0xc1, on=>0x81, off=>0x05,
secNwOn=>0xc1, secOn=>0x81 } },
"removeNode" => { cmd => "4b%02x@", # ZW_REMOVE_NODE_FROM_NETWORK' "removeNode" => { cmd => "4b%02x@", # ZW_REMOVE_NODE_FROM_NETWORK'
param => {nwOn=>0xc1, on=>0x81, off=>0x05 } }, param => {nwOn=>0xc1, on=>0x81, off=>0x05 } },
"createNode" => { cmd => "60%02x" }, # ZW_REQUEST_NODE_INFO' "createNode" => { cmd => "60%02x" }, # ZW_REQUEST_NODE_INFO'
@ -171,6 +172,14 @@ ZWDongle_Set($@)
return "$type is unsupported by this controller"; return "$type is unsupported by this controller";
} }
if($type eq "addNode") {
if($a[0] && $a[0] =~ m/sec/i) {
$hash->{addSecure} = 1;
} else {
delete($hash->{addSecure});
}
}
my $par = $sets{$type}{param}; my $par = $sets{$type}{param};
if($par && !$par->{noArg}) { if($par && !$par->{noArg}) {
return "Unknown argument for $type, choose one of ".join(" ",keys %{$par}) return "Unknown argument for $type, choose one of ".join(" ",keys %{$par})
@ -186,13 +195,6 @@ ZWDongle_Set($@)
$cmd =~ s/\@/$c/g; $cmd =~ s/\@/$c/g;
} }
if($type eq "addNode") {
if(@a == 2 && $a[1] =~ m/^sec/i) {
$hash->{addSecure} = pop(@a);
} else {
delete($hash->{addSecure});
}
}
my @ca = split("%", $cmd, -1); my @ca = split("%", $cmd, -1);
my $nargs = int(@ca)-1; my $nargs = int(@ca)-1;
@ -740,7 +742,7 @@ ZWDongle_Ready($)
<b>Set</b> <b>Set</b>
<ul> <ul>
<li>addNode [nwOn|on|off] [sec]<br> <li>addNode [on|nwOn|secOn|secNwOn|off]<br>
Activate (or deactivate) inclusion mode. The controller (i.e. the dongle) Activate (or deactivate) inclusion mode. The controller (i.e. the dongle)
will accept inclusion (i.e. pairing/learning) requests only while in this will accept inclusion (i.e. pairing/learning) requests only while in this
mode. After activating inclusion mode usually you have to press a switch mode. After activating inclusion mode usually you have to press a switch
@ -748,14 +750,15 @@ ZWDongle_Ready($)
of the controller. If autocreate is active, a fhem device will be created of the controller. If autocreate is active, a fhem device will be created
after inclusion. "on" activates standard inclusion. "nwOn" activates network after inclusion. "on" activates standard inclusion. "nwOn" activates network
wide inclusion (only SDK 4.5-4.9, SDK 6.x and above).<br> wide inclusion (only SDK 4.5-4.9, SDK 6.x and above).<br>
If sec is specified, the ZWDongle networkKey ist set, and the device If secOn/secNwOn is specified, the ZWDongle networkKey ist set, and the
supports the SECURITY class, then a secure inclusion is attempted. device supports the SECURITY class, then a secure inclusion is attempted.
</li> </li>
<li>removeNode [nwOn|on|off]<br> <li>removeNode [nwOn|on|off]<br>
Activate (or deactivate) exclusion mode. "on" activates standard exclusion. Activate (or deactivate) exclusion mode. "on" activates standard exclusion.
"nwOn" activates network wide exclusion (only SDK 4.5-4.9, SDK 6.x and above). "nwOn" activates network wide exclusion (only SDK 4.5-4.9, SDK 6.x and
Note: the corresponding fhem device have to be deleted manually.</li> above). Note: the corresponding fhem device have to be deleted
manually.</li>
<li>createNode id<br> <li>createNode id<br>
Request the class information for the specified node, and create a fhem Request the class information for the specified node, and create a fhem