From 07290e1a50257a5a7539fa0b4e2c9dabc5bcfc37 Mon Sep 17 00:00:00 2001 From: martinp876 Date: Thu, 4 Apr 2013 18:25:21 +0000 Subject: [PATCH] TC correct timer in HMLAN git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@3033 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_HMLAN.pm | 4 ++-- fhem/FHEM/10_CUL_HM.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/00_HMLAN.pm b/fhem/FHEM/00_HMLAN.pm index cadce5d7f..1afdc14f8 100755 --- a/fhem/FHEM/00_HMLAN.pm +++ b/fhem/FHEM/00_HMLAN.pm @@ -250,7 +250,7 @@ sub HMLAN_Parse($$) {########################################################## my $srcId = (length($mFld[5])>11)?$src:"lastRec"; $hash->{helper}{nextSend}{$srcId} = gettimeofday() + 0.100; if ($debug){ - Log $ll5, 'HMLAN_Parse: '.$name.' S:'.$mFld[0] + Log $ll5, 'HMLAN_Pars1: '.$name.' S:'.$mFld[0] .(($mFld[0] =~ m/^E/)?' ':'') .' stat:'.$mFld[1] .' t:'.$mFld[2].' d:'.$mFld[3] @@ -446,7 +446,7 @@ sub HMLAN_secSince2000() {##################################################### my $t = time(); my @l = localtime($t); my @g = gmtime($t); - $t += 60*(($l[2]-$g[2] + ((($l[5]<<9)|$l[7]) <=> (($g[5]<<9)|$g[7])) * 24 + $l[8]) * 60 + $l[1]-$g[1]) + $t += 60*(($l[2]-$g[2] + ((($l[5]<<9)|$l[7]) <=> (($g[5]<<9)|$g[7])) * 24) * 60 + $l[1]-$g[1]) # timezone and daylight saving... - 946684800 # seconds between 01.01.2000, 00:00 and THE EPOCH (1970) - 7200; # HM Special diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 96ca2189a..7c206a013 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -3341,9 +3341,9 @@ sub CUL_HM_decodeTime16($) {#################### sub CUL_HM_secSince2000() {##################### # Calculate the local time in seconds from 2000. my $t = time(); + my @l = localtime($t); my @g = gmtime($t); - # my $t2 = $t + 60*(($l[2]-$g[2] + ((($l[5]<<9)|$l[7]) <=> (($g[5]<<9)|$g[7])) * 24 + $l[8]) * 60 + $l[1]-$g[1]) my $t2 = $t + 60*(($l[2]-$g[2] + ((($l[5]<<9)|$l[7]) <=> (($g[5]<<9)|$g[7])) * 24) * 60 + $l[1]-$g[1]) # timezone and daylight saving... - 946684800 # seconds between 01.01.2000, 00:00 and THE EPOCH (1970)