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

# $Id added to get version information

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@3720 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dietmar63 2013-08-16 18:46:51 +00:00
parent b389df8d78
commit 781f2b85bd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FHEM/59_Twilight.pm
View File

@ -1,3 +1,4 @@
# $Id
############################################################################## ##############################################################################
# #
# 59_Twilight.pm # 59_Twilight.pm

3
FHEM/98_Heating_Control.pm
View File

@ -1,5 +1,4 @@
# $Id
# $Id$
############################################################################## ##############################################################################
# #
# 98_Heating_Control.pm # 98_Heating_Control.pm

6
FHEM/98_RandomTimer.pm
View File

@ -1,3 +1,4 @@
# $Id
############################################################################## ##############################################################################
# #
# 98_RandomTimer_Initialize.pm # 98_RandomTimer_Initialize.pm
@ -135,7 +136,8 @@ sub RandomTimer_ExecRepeater($)
my $timeToStart = $now + 3600*($thour-$hour) + 60*($tmin-$min) + ($tsec-$sec); my $timeToStart = $now + 3600*($thour-$hour) + 60*($tmin-$min) + ($tsec-$sec);
my $timeToStop = $now + 3600*($shour-$hour) + 60*($smin-$min) + ($ssec-$sec); my $timeToStop = $now + 3600*($shour-$hour) + 60*($smin-$min) + ($ssec-$sec);
$timeToStop += 24*3600 if ($timeToStart>=$timeToStop); $timeToStop += 24*3600 if ($timeToStart>=$timeToStop);
$hash->{STATE} = strftime("%H:%M:%S",localtime($timeToStart));
my $timeToExec; my $timeToExec;
my $function = "RandomTimer_ExecRepeater"; my $function = "RandomTimer_ExecRepeater";
@ -143,7 +145,6 @@ sub RandomTimer_ExecRepeater($)
my $midnight = $now + 24*3600 -(3600*$hour + 60*$min + $sec); my $midnight = $now + 24*3600 -(3600*$hour + 60*$min + $sec);
$timeToExec = max ($timeToStop, $midnight) + 5*60; $timeToExec = max ($timeToStop, $midnight) + 5*60;
$hash->{STATE} = strftime("%H:%M:%S",localtime($timeToStart));
delete $hash->{STARTTIME}; delete $hash->{STARTTIME};
} else { } else {
@ -153,7 +154,6 @@ sub RandomTimer_ExecRepeater($)
$timeToExec = $now + 1; $timeToExec = $now + 1;
$function = "RandomTimer_Exec"; $function = "RandomTimer_Exec";
} }
$hash->{STATE} = strftime("%H:%M:%S",localtime($timeToExec));
} }
Log $logLevel, "[".$hash->{NAME}. "]"." Next timer ".strftime("%d.%m.%Y %H:%M:%S",localtime($timeToExec)); Log $logLevel, "[".$hash->{NAME}. "]"." Next timer ".strftime("%d.%m.%Y %H:%M:%S",localtime($timeToExec));