mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10_ZWave.pm: add async "addNode failed" message (Forum #51411)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11269 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2016-04-17 12:15:02 +00:00
parent 5a6e562eba
commit 93b0ae3565
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/00_ZWDongle.pm
View File

@@ -181,6 +181,14 @@ ZWDongle_Set($@)
} else {
delete($hash->{addSecure});
}
if($a[0]) { # Remember the client for the failed message
if($a[0] eq "off") {
delete($hash->{addCL});
} elsif($hash->{CL}) {
$hash->{addCL} = $hash->{CL};
}
}
}
my $par = $sets{$type}{param};

9
fhem/FHEM/10_ZWave.pm
View File

@@ -3738,20 +3738,21 @@ ZWave_Parse($$@)
my $dh = $modules{ZWave}{defptr}{"$homeId $1"};
return "" if(!$dh);
asyncOutput($iodev->{addCL}, "addNode ok");
my $addSecure = $iodev->{addSecure}; # addNode off deletes it
AnalyzeCommand(undef, "set $ioName addNode off")
if($cmd eq 'ZW_ADD_NODE_TO_NETWORK');
ZWave_wakeupTimer($dh, 1) if(ZWave_isWakeUp($dh));
my $addSecure = $iodev->{addSecure}; # addNode off deletes it
if($addSecure) {
return "" if (ZWave_secIncludeStart($dh, $iodev) == 1);
}
return "" if($addSecure && ZWave_secIncludeStart($dh, $iodev) == 1);
return ZWave_execInits($dh, 0);
}
# addNode off generates ZW_ADD_NODE_TO_NETWORK:done sometimes (#51411)
if($evt eq "failed" && $cmd eq 'ZW_ADD_NODE_TO_NETWORK') {
asyncOutput($iodev->{addCL}, "addNode failed");
AnalyzeCommand(undef, "set $ioName addNode off")
}