FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

git-svn-id: https://svn.fhem.de/fhem/trunk@6025 2b470e98-0d58-463d-a4d8-8e2adae1ed80

Browse Source
This commit is contained in:
tpoitzsch 2014-06-01 12:07:58 +00:00
parent 78fc9a9b3f
commit d584497bed
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/FHEM/23_LUXTRONIK2.pm
View File

@ -1450,7 +1450,7 @@ LUXTRONIK2_doStatisticMinMax ($$$)
$yearLast += 1900;
$monthLast ++;
}
($dummy, $dummy, $dummy, $dayNow, $monthNow, $yearNow) = localtime;
($dummy, $dummy, $dummy, $dayNow, $monthNow, $yearNow) = localtime ( gettimeofday() + $hash->{INTERVAL});
$yearNow += 1900;
$monthNow ++;
@ -1568,7 +1568,7 @@ LUXTRONIK2_doStatisticDelta ($$$$$)
$previousTariff = 0;
$showDate = 6;
}
($dummy, $dummy, $dummy, $dayNow, $monthNow, $yearNow) = localtime;
($dummy, $dummy, $dummy, $dayNow, $monthNow, $yearNow) = localtime (gettimeofday() + $hash->{INTERVAL});
if ($yearNow != $yearLast) { $periodSwitch = 3; }
elsif ($monthNow != $monthLast) { $periodSwitch = 2; }
elsif ($dayNow != $dayLast) { $periodSwitch = 1; }

4
fhem/FHEM/70_JSONMETER.pm
View File

@ -660,7 +660,7 @@ JSONMETER_doStatisticMinMax ($$$)
$yearLast += 1900;
$monthLast ++;
}
($dummy, $dummy, $dummy, $dayNow, $monthNow, $yearNow) = localtime;
($dummy, $dummy, $dummy, $dayNow, $monthNow, $yearNow) = localtime ( gettimeofday() + $hash->{INTERVAL});
$yearNow += 1900;
$monthNow ++;
@ -756,7 +756,7 @@ JSONMETER_doStatisticDelta ($$$$$)
$previousTariff = 0;
$showDate = 8;
}
($dummy, $dummy, $hourNow, $dayNow, $monthNow, $yearNow) = localtime;
($dummy, $dummy, $hourNow, $dayNow, $monthNow, $yearNow) = localtime ( gettimeofday() + $hash->{INTERVAL});
if ($yearNow != $yearLast) { $periodSwitch = 4; }
elsif ($monthNow != $monthLast) { $periodSwitch = 3; }

5
fhem/FHEM/98_statistics.pm
View File

@ -689,7 +689,6 @@ statistics_doStatisticSpecialPeriod ($$$$$)
{
my ($hash, $dev, $readingName, $decPlaces, $value) = @_;
my $name = $hash->{NAME};
my $result;
my $specialPeriod = AttrVal($name, "specialDeltaPeriodHours", 0);
@ -697,7 +696,9 @@ statistics_doStatisticSpecialPeriod ($$$$$)
my $statReadingName = $hash->{PREFIX} . ucfirst($readingName) . "SpecialPeriod";
my $hiddenReadingName = ".".$dev->{NAME} . ":" . $readingName . "SpecialPeriod";
my @hidden = split / /, ($value . " " . $hash->{READINGS}{$hiddenReadingName}{VAL}); # Internal values
my $result = $value;
if (exists ($hash->{READINGS}{$hiddenReadingName}{VAL})) { $result .= " " . $hash->{READINGS}{$hiddenReadingName}{VAL}; }
my @hidden = split / /, $result; # Internal values
if ( exists($hidden[$specialPeriod]) ) { delete $hidden[$specialPeriod]; }
foreach my $val (@hidden) { $result += $val; }