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

10_ZWave.pm: change parseHook order, add veto possibility (Forum #38587)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10608 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-01-23 13:50:40 +00:00
parent 82833b8ef3
commit c41c9d0595
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/10_ZWave.pm
View File

@ -2189,6 +2189,7 @@ ZWave_associationRequest($$)
return if($grp >= $nGrp); return if($grp >= $nGrp);
$zwave_parseHook{"$hash->{nodeIdHex}:..85"} = \&ZWave_associationRequest; $zwave_parseHook{"$hash->{nodeIdHex}:..85"} = \&ZWave_associationRequest;
ZWave_Set($hash, $hash->{NAME}, "associationRequest", $grp+1); ZWave_Set($hash, $hash->{NAME}, "associationRequest", $grp+1);
return undef; # No veto for further parsing
} }
@ -3358,26 +3359,28 @@ ZWave_Parse($$@)
next; next;
} }
my $matched = 0; my $hookVeto = 0;
foreach my $k (keys %{$ptr}) {
if($arg =~ m/^$k/) {
my $val = $ptr->{$k};
my @val = ($val);
@val = eval $val if(index($val, '$') >= 0);
push @event, @val if(defined($val[0]));
$matched++;
}
}
foreach my $h (keys %zwave_parseHook) { foreach my $h (keys %zwave_parseHook) {
if("$id:$arg" =~ m/$h/) { if("$id:$arg" =~ m/$h/) {
my $fn = $zwave_parseHook{$h}; my $fn = $zwave_parseHook{$h};
delete $zwave_parseHook{$h}; delete $zwave_parseHook{$h};
$fn->($hash, $arg); $hookVeto++ if($fn->($hash, $arg));
} }
} }
push @event, "UNPARSED:$className $arg" if(!$matched); if(!$hookVeto) {
my $matched = 0;
foreach my $k (keys %{$ptr}) {
if($arg =~ m/^$k/) {
my $val = $ptr->{$k};
my @val = ($val);
@val = eval $val if(index($val, '$') >= 0);
push @event, @val if(defined($val[0]));
$matched++;
}
}
push @event, "UNPARSED:$className $arg" if(!$matched);
}
} }
if($arg =~ m/^028407/) { # wakeup:notification if($arg =~ m/^028407/) { # wakeup:notification