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

RESIDENTStk: fix wakeupWaitPeriod threshold calculation

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10522 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-01-16 15:53:36 +00:00
parent 5221bf7f9f
commit c476d870f7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/RESIDENTStk.pm
View File

@ -969,9 +969,12 @@ sub RESIDENTStk_wakeupRun($;$) {
} }
my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
localtime( time + $wakeupOffset * 60 ); localtime( time() + $wakeupOffset * 60 );
$mon += 01;
$year += 1900;
$mon++;
$mon = "0" . $mon if ( $mon < 10 );
$mday = "0" . $mday if ( $mday < 10 );
$hour = "0" . $hour if ( $hour < 10 ); $hour = "0" . $hour if ( $hour < 10 );
$min = "0" . $min if ( $min < 10 ); $min = "0" . $min if ( $min < 10 );
@ -1593,7 +1596,7 @@ sub RESIDENTStk_TimeDiff ($$;$) {
sub RESIDENTStk_Datetime2Timestamp($) { sub RESIDENTStk_Datetime2Timestamp($) {
my ($datetime) = @_; my ($datetime) = @_;
my $timestamp; my $timestamp = 0;
if ( $datetime =~ if ( $datetime =~
/.*([0-9]{4})-([0-9]{1}|[0-9]{2})-([0-9]{1}|[0-9]{2}).([0-9]{1}|[0-9]{2}):([0-9]{1}|[0-9]{2}):([0-9]{1}|[0-9]{2}).*/ /.*([0-9]{4})-([0-9]{1}|[0-9]{2})-([0-9]{1}|[0-9]{2}).([0-9]{1}|[0-9]{2}):([0-9]{1}|[0-9]{2}):([0-9]{1}|[0-9]{2}).*/
@ -1612,9 +1615,8 @@ sub RESIDENTStk_Datetime2Timestamp($) {
$timestamp = timelocal( $sec, $min, $hour, $d, $m, $y ); $timestamp = timelocal( $sec, $min, $hour, $d, $m, $y );
} }
else { else {
Log3 $name, 5, Log3 undef, 5,
"RESIDENTStk $name: timestamp '$datetime' has wrong format."; "RESIDENTStk: timestamp '$datetime' has wrong format.";
$timestamp = timelocal( "00", "00", "00", "01", "01", "1970" );
} }
return $timestamp; return $timestamp;