FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-13 23:36:37 +00:00
Code Issues Releases Wiki Activity

Sprinkle.pm: add fix for schedule in past

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5931 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tobiasfaust 2014-05-22 13:57:52 +00:00
parent 974b2272c8
commit 503a906aaf
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/contrib/97_SprinkleControl.pm
View File

@ -271,7 +271,7 @@ sub UpdateSprinkleControlList($$) {
foreach my $d (sort keys %defs) { foreach my $d (sort keys %defs) {
if($defs{$d}{TYPE} eq "SprinkleControl") { if($defs{$d}{TYPE} eq "SprinkleControl") {
push(@newlist, $d) unless(defined($hash) && ($d eq $hash->{NAME}) && ($cmd eq "del")) push(@newlist, $d) unless(defined($hash) && ($d eq $hash->{NAME}) && ($cmd eq "del"));
} }
} }

15
fhem/contrib/98_Sprinkle.pm
View File

@ -285,10 +285,14 @@ sub Sprinkle_InternalTimerDoIt(@) {
my ($rel, $hr, $min, $sec) = ($1, $2, $3, $4); my ($rel, $hr, $min, $sec) = ($1, $2, $3, $4);
my @lt = localtime(time); my @lt = localtime(time);
my $nt = time; my $nt = time;
$nt -= ($lt[2]*3600+$lt[1]*60+$lt[0]) # Midnight for absolute time
if($rel ne "+"); if($rel ne "+") {
$nt += ($hr*3600+$min*60+$sec); # Plus relative time $nt -= (($lt[2]*3600)+($lt[1]*60)+$lt[0]); # Midnight for absolute time
$nt += 86400 if((($lt[2]*3600)+($lt[1]*60)+$lt[0]) >= (($hr*3600)+($min*60)+$sec)); # tomorrow is next time
}
$nt += (($hr*3600)+($min*60)+$sec); # Plus relative time
@lt = localtime($nt); @lt = localtime($nt);
my $ntm = sprintf("%02d:%02d:%02d", $lt[2], $lt[1], $lt[0]); my $ntm = sprintf("%02d:%02d:%02d", $lt[2], $lt[1], $lt[0]);
$hash->{NextTime} = $ntm; $hash->{NextTime} = $ntm;
@ -394,7 +398,7 @@ sub Sprinkle_DoIt($$) {
if($oldState ne "on" && (($SprinkleControl && SprinkleControl_AllocateNewThread($SprinkleControl, $me, $cmd)) || !$SprinkleControl)) { if($oldState ne "on" && (($SprinkleControl && SprinkleControl_AllocateNewThread($SprinkleControl, $me, $cmd)) || !$SprinkleControl)) {
fhem "set $device $OnCmdAdd $OnCmd"; fhem "set $device $OnCmdAdd $OnCmd";
$doit = 1; $doit = 1;
} elsif ($oldState ne $newState) { } elsif($oldState ne $newState) {
$newState = "Wait"; $newState = "Wait";
$doit = 2; $doit = 2;
} }
@ -408,7 +412,6 @@ sub Sprinkle_DoIt($$) {
} }
readingsSingleUpdate($hash, "state", $newState, 1) if($doit >= 1); readingsSingleUpdate($hash, "state", $newState, 1) if($doit >= 1);
return $newState; return $newState;
} }