Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_DOIF.pm: fixed attribute repeatcmd

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@14790 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2017-07-26 10:27:41 +00:00
parent 99ef8510df
commit 3e981e7c44
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
FHEM/98_DOIF.pm
View File

@ -1446,7 +1446,7 @@ DOIF_cmd ($$$$)
DOIF_cmd ($hash,$nr,$subnr,$event); DOIF_cmd ($hash,$nr,$subnr,$event);
} }
} else { } else {
if (defined ($sleeptimer[$nr])) { if ($sleeptimer[$nr]) {
my $last_cond=ReadingsVal($pn,"cmd_nr",0)-1; my $last_cond=ReadingsVal($pn,"cmd_nr",0)-1;
if (DOIF_SetSleepTimer($hash,$last_cond,$nr,0,$event,-1,$sleeptimer[$nr])) { if (DOIF_SetSleepTimer($hash,$last_cond,$nr,0,$event,-1,$sleeptimer[$nr])) {
DOIF_cmd ($hash,$nr,$subnr,$event); DOIF_cmd ($hash,$nr,$subnr,$event);
@ -2041,9 +2041,9 @@ DOIF_SetSleepTimer($$$$$$$)
or AttrVal($pn,"do","") eq "always" or AttrVal($pn,"do","") eq "always"
or AttrVal($pn,"do","") eq "resetwait" or AttrVal($pn,"do","") eq "resetwait"
or AttrVal($pn,"repeatsame","") or AttrVal($pn,"repeatsame","")
or defined($repeatcmd))) { or $repeatcmd)) {
my $sleeptime=0; my $sleeptime=0;
if (defined ($repeatcmd)) { if ($repeatcmd) {
$sleeptime=$repeatcmd; $sleeptime=$repeatcmd;
} else { } else {
my @sleeptimer=SplitDoIf(':',AttrVal($pn,"wait","")); my @sleeptimer=SplitDoIf(':',AttrVal($pn,"wait",""));
@ -2073,7 +2073,7 @@ DOIF_SetSleepTimer($$$$$$$)
} }
InternalTimer($next_time, "DOIF_SleepTrigger",$hash, 0); InternalTimer($next_time, "DOIF_SleepTrigger",$hash, 0);
return 0; return 0;
} elsif (defined($repeatcmd)){ } elsif ($repeatcmd){
return 0; return 0;
} else { } else {
return 1; return 1;