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

year change issue fixed

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4554 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
bentele 2014-01-04 10:48:35 +00:00
parent edb6f45fec
commit e8e25a6c9c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/70_SML.pm
View File

@ -8,7 +8,7 @@
# #
# $Id$ # $Id$
# #
# Version = 2.6 # Version = 2.7
# #
############################################################################## ##############################################################################
# #
@ -355,7 +355,7 @@ sml_energy_energyDone($)
}else{ }else{
my ($dateLast, $monthLast, $dayLast, $hourLast, $minLast, $secLast) = $hash->{READINGS}{MONTHPOWER}{TIME} =~ /^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/; my ($dateLast, $monthLast, $dayLast, $hourLast, $minLast, $secLast) = $hash->{READINGS}{MONTHPOWER}{TIME} =~ /^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/;
my ($powLast) = $hash->{READINGS}{MONTHPOWER}{VAL} =~ /^(.*)$/; my ($powLast) = $hash->{READINGS}{MONTHPOWER}{VAL} =~ /^(.*)$/;
Log3 $hash, 4, "$hash->{NAME} myhour: $dateLast $monthLast $dayLast $hourLast $minLast $secLast $powLast"; Log3 $hash, 4, "$hash->{NAME} month: $dateLast $monthLast $dayLast $hourLast $minLast $secLast $powLast";
$hash->{READINGS}{MONTHPOWER}{TIME} = $timenow; $hash->{READINGS}{MONTHPOWER}{TIME} = $timenow;
if ( $monthLast eq $month ){ # es ist der gleiche Monat if ( $monthLast eq $month ){ # es ist der gleiche Monat
$powLast += $newpower ; $powLast += $newpower ;
@ -374,9 +374,9 @@ sml_energy_energyDone($)
}else{ }else{
my ($dateLast, $monthLast, $dayLast, $hourLast, $minLast, $secLast) = $hash->{READINGS}{YEARPOWER}{TIME} =~ /^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/; my ($dateLast, $monthLast, $dayLast, $hourLast, $minLast, $secLast) = $hash->{READINGS}{YEARPOWER}{TIME} =~ /^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/;
my ($powLast) = $hash->{READINGS}{YEARPOWER}{VAL} =~ /^(.*)$/; my ($powLast) = $hash->{READINGS}{YEARPOWER}{VAL} =~ /^(.*)$/;
Log3 $hash, 4, "$hash->{NAME} myhour: $dateLast $monthLast $dayLast $hourLast $minLast $secLast $powLast"; Log3 $hash, 4, "$hash->{NAME} yearpower: $dateLast $monthLast $dayLast $hourLast $minLast $secLast $powLast";
$hash->{READINGS}{YEARPOWER}{TIME} = $timenow; $hash->{READINGS}{YEARPOWER}{TIME} = $timenow;
if ( $yearhLast eq $year ){ # es ist das gleiche Jahr if ( $dateLast eq $date ){ # es ist das gleiche Jahr
$powLast += $newpower ; $powLast += $newpower ;
$hash->{READINGS}{YEARPOWER}{VAL} = $powLast; $hash->{READINGS}{YEARPOWER}{VAL} = $powLast;
Log3 $hash, 4, "$hash->{NAME} Gleiches Jahr timenow: $timenow newpower $newpower powlast $powLast"; Log3 $hash, 4, "$hash->{NAME} Gleiches Jahr timenow: $timenow newpower $newpower powlast $powLast";