2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 20:24:36 +00:00

98_Heating_Control.pm, 98_WeekdayTimer.pm : bug in computing switchingtimes repaired

git-svn-id: https://svn.fhem.de/fhem/trunk@7061 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dietmar63 2014-11-24 22:27:02 +00:00
parent 79c7c9f1f7
commit 94052abd8a

View File

@ -271,8 +271,10 @@ sub Heating_Control_ParseSwitchingProfile($$$) {
@days = sort(SortNumber keys %hdays); @days = sort(SortNumber keys %hdays);
my $TIME_AS_PERL = 0;
if($time =~ m/^\{.*\}$/g) { if($time =~ m/^\{.*\}$/g) {
$hash->{TIME_AS_PERL} = 1; $TIME_AS_PERL = 1;
$hash->{TIME_AS_PERL} |= 1;
} }
my $now = time(); my $now = time();
@ -281,7 +283,7 @@ sub Heating_Control_ParseSwitchingProfile($$$) {
for (my $d=0; $d<@days; $d++) { for (my $d=0; $d<@days; $d++) {
# Zeitangabe verarbeiten. # Zeitangabe verarbeiten.
if ($hash->{TIME_AS_PERL}) { # Perlausdruck {*} if ($TIME_AS_PERL) { # Perlausdruck {*}
my $date = $now+($d-$wday)*86400; my $date = $now+($d-$wday)*86400;
$timeString = '{ my $date='."$date;" .$time."}"; $timeString = '{ my $date='."$date;" .$time."}";
$timeString = eval( $timeString ); # must deliver HH:MM[:SS] $timeString = eval( $timeString ); # must deliver HH:MM[:SS]