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

10_ZWave.pm: fix auto-association at inclusion (Forum #51090)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11107 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-03-20 20:13:37 +00:00
parent 7deb3fa16a
commit 65373ffa4d
1 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fhem/FHEM/10_ZWave.pm
View File

@ -638,12 +638,10 @@ ZWave_Define($$)
}
sub
ZWave_initFromModelfile($$)
ZWave_initFromModelfile($$$)
{
my ($name, $ctrlId) = @_;
my ($name, $ctrlId, $cfg) = @_;
my @res;
my $cfg = ReadingsVal($name, "modelConfig", "");
return @res if(!$cfg);
ZWave_configParseModel($cfg) if(!$zwave_modelConfig{$cfg});
my $mc = $zwave_modelConfig{$cfg};
return @res if(!$mc);
@ -656,26 +654,9 @@ ZWave_initFromModelfile($$)
}
sub
ZWave_doExecInits($)
ZWave_execInits($$;$)
{
my ($param) = @_;
my $cmdArr = $param->{cmdArr};
my $cmd = shift @{$cmdArr};
my $ret = AnalyzeCommand(undef, $cmd);
Log 1, "ZWAVE INIT: $cmd: $ret" if ($ret);
push(@{$cmdArr}, ZWave_initFromModelfile($1, $param->{ctrlId}))
if($cmd =~ m/^get (.*) model$/);
InternalTimer(gettimeofday()+0.5, "ZWave_doExecInits", $param, 0)
if(@{$cmdArr});
}
sub
ZWave_execInits($$)
{
my ($hash, $min) = @_; # min = 50 for model-specific stuff
my ($hash, $min, $cfg) = @_; # min = 50 for model-specific stuff
my @clList = split(" ", $attr{$hash->{NAME}}{classes});
my (@initList, %seen);
@ -696,8 +677,14 @@ ZWave_execInits($$)
push @cmd, eval $i->{CMD};
}
InternalTimer(gettimeofday()+0.5, "ZWave_doExecInits",
{ cmdArr=>\@cmd, ctrlId=>$CTRLID }, 0) if(@cmd);
push @cmd, ZWave_initFromModelfile($hash->{NAME}, $CTRLID, $cfg)
if($cfg); # model specific init, called from "get model"
foreach my $cmd (@cmd) {
my $ret = AnalyzeCommand(undef, $cmd);
Log 1, "ZWAVE INIT: $cmd: $ret" if ($ret);
}
}
@ -2117,7 +2104,6 @@ ZWave_mfsParse($$$$$)
if($config == 2) {
setReadingsVal($hash, "modelId", "$mf-$prod-$id", TimeNow());
ZWave_execInits($hash, 50);
return "modelId:$mf-$prod-$id";
}
@ -2136,10 +2122,10 @@ ZWave_mfsParse($$$$$)
if($l =~ m/<Product type\s*=\s*"([^"]*)".*id\s*=\s*"([^"]*)".*name\s*=\s*"([^"]*)"/) {
if($mf eq $lastMf && $prod eq lc($1) && $id eq lc($2)) {
if($config) {
$ret = "modelConfig:".
(($l =~ m/config\s*=\s*"([^"]*)"/) ? $1 : "unknown");
$ret = (($l =~ m/config\s*=\s*"([^"]*)"/) ? $1 : "unknown");
ZWave_mfsAddClasses($hash, $1);
return $ret;
ZWave_execInits($hash, 50, $ret);
return "modelConfig:$ret";
} else {
$ret = "model:$mName $3";
}
@ -3740,10 +3726,13 @@ ZWave_Parse($$@)
if($cmd eq 'ZW_ADD_NODE_TO_NETWORK');
}
if($evt eq "protocolDone" && $arg =~ m/(..)../) {# done comes at addNode off
if($evt eq "protocolDone" && $arg =~ m/(..)../) {
my $dh = $modules{ZWave}{defptr}{"$homeId $1"};
return "" if(!$dh);
AnalyzeCommand(undef, "set $ioName addNode off")
if($cmd eq 'ZW_ADD_NODE_TO_NETWORK');
ZWave_wakeupTimer($dh, 1) if(ZWave_isWakeUp($dh));
if($iodev->{addSecure}) {