FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 20:24:36 +00:00
Code Issues Releases Wiki Activity

98_MSwitch.pm:fix Calculation time range over date limit

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18049 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Byte09 2018-12-25 06:42:59 +00:00
parent f8f02fa1f6
commit cc211cc205
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/FHEM/98_MSwitch.pm
View File

@ -6580,7 +6580,7 @@ sub MSwitch_checkcondition($$$) {
if ( $field =~ m/([0-9]{2}):([0-9]{2}):([0-9]{2})/ ) { if ( $field =~ m/([0-9]{2}):([0-9]{2}):([0-9]{2})/ ) {
my $hh = $1; my $hh = $1;
if ( $hh > 23 ) { $hh = $hh - 24 } if ( $hh > 23 ) { $hh = $hh - 24 }
if ( $hh < 10 ) { $hh = "0" . $hh } #if ( $hh < 10 ) { $hh = "0" . $hh }
$field = $hh . ":" . $2; $field = $hh . ":" . $2;
} }
@ -6937,7 +6937,7 @@ sub MSwitch_Checkcond_time($$) {
#my $time1; #my $time1;
my ( $tday, $tmonth, $tdate, $tn ); #my ($tday,$tmonth,$tdate,$tn,$time1); my ( $tday, $tmonth, $tdate, $tn ); #my ($tday,$tmonth,$tdate,$tn,$time1);
if ( ( $akthour < $hour1 && $akthour < $hour2 ) && $hour2 < $hour1 ) # und if ( ( $akthour < $hour1 && $akthour <= $hour2 ) && $hour2 < $hour1 ) # und
{ {
use constant SECONDS_PER_DAY => 60 * 60 * 24; use constant SECONDS_PER_DAY => 60 * 60 * 24;
$timecondtest = localtime( time - SECONDS_PER_DAY ); $timecondtest = localtime( time - SECONDS_PER_DAY );