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

98_DOIF.pm: new internal DOIFDEV, delete wait_timer when global INITIALIZED

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20254 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian
2019-09-26 18:06:30 +00:00
parent 9492798ba5
commit c0df2d0925
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/98_DOIF.pm
View File

@@ -2413,6 +2413,11 @@ sub DOIF_Set_Filter
} }
} }
notifyRegexpChanged($hash,$hash->{helper}{NOTIFYDEV}); notifyRegexpChanged($hash,$hash->{helper}{NOTIFYDEV});
if (defined ($hash->{NOTIFYDEV})) {
delete ($hash->{DOIFDEV});
} else {
$hash->{DOIFDEV}=$hash->{helper}{DEVFILTER};
}
} }
sub sub
@@ -2446,6 +2451,7 @@ DOIF_Notify($$)
foreach my $key (keys %{$defs{$hash->{NAME}}{READINGS}}) { foreach my $key (keys %{$defs{$hash->{NAME}}{READINGS}}) {
delete $defs{$hash->{NAME}}{READINGS}{$key} if ($key =~ "^timer_"); delete $defs{$hash->{NAME}}{READINGS}{$key} if ($key =~ "^timer_");
} }
delete ($defs{$hash->{NAME}}{READINGS}{wait_timer});
if ($hash->{helper}{last_timer} > 0){ if ($hash->{helper}{last_timer} > 0){
for (my $j=0; $j<$hash->{helper}{last_timer};$j++) { for (my $j=0; $j<$hash->{helper}{last_timer};$j++) {
DOIF_SetTimer ($hash,"DOIF_TimerTrigger",$j); DOIF_SetTimer ($hash,"DOIF_TimerTrigger",$j);