From d4ab70d64d331223c897fd7b7a1fb5092ccfb098 Mon Sep 17 00:00:00 2001 From: tpoitzsch Date: Mon, 26 May 2014 19:04:03 +0000 Subject: [PATCH] bugfix git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@5978 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_statistics.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/98_statistics.pm b/fhem/FHEM/98_statistics.pm index 2363077df..87fa05964 100644 --- a/fhem/FHEM/98_statistics.pm +++ b/fhem/FHEM/98_statistics.pm @@ -662,11 +662,11 @@ statistics_doStatisticDelta ($$$$$) # Store single readings my $singularReadings = AttrVal($name, "singularReadings", ""); if ($singularReadings ne "") { - # statistics_storeSingularReadings $hashName,$singularReadings,$dev,$statReadingName,$readingName,$statType,$period,$statValue,$value,$saveLast + # statistics_storeSingularReadings $hashName,$singularReadings,$dev,$statReadingName,$readingName,$statType,$period,$statValue,$lastValue,$saveLast statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Delta","Hour",$stat[1],$last[1],$periodSwitch >= 1); - statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Delta","Day",$stat[1],$last[1],$periodSwitch >= 2); - statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Delta","Month",$stat[1],$last[1],$periodSwitch >= 3); - statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Delta","Year",$stat[1],$last[1],$periodSwitch >= 4); + statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Delta","Day",$stat[3],$last[3],$periodSwitch >= 2); + statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Delta","Month",$stat[5],$last[5],$periodSwitch >= 3); + statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Delta","Year",$stat[7],$last[7],$periodSwitch >= 4); } # Store hidden reading @@ -780,7 +780,7 @@ statistics_doStatisticDurationSingle ($$$$$$) sub #################### statistics_storeSingularReadings ($$$$$$$$$$) { - my ($hashName,$singularReadings,$dev,$statReadingName,$readingName,$statType,$period,$statValue,$value,$saveLast) = @_; + my ($hashName,$singularReadings,$dev,$statReadingName,$readingName,$statType,$period,$statValue,$lastValue,$saveLast) = @_; return if $singularReadings eq ""; if ($statType eq "Delta") { $statReadingName .= $period;} @@ -790,8 +790,8 @@ statistics_storeSingularReadings ($$$$$$$$$$) readingsBulkUpdate($dev, $statReadingName, $statValue, 1); Log3 $hashName, 5, "Set ".$statReadingName." = $statValue"; if ($saveLast) { - readingsBulkUpdate($dev, $statReadingName."Last", $value, 1); - Log3 $hashName, 5, "Set ".$statReadingName."Last = $value"; + readingsBulkUpdate($dev, $statReadingName."Last", $lastValue, 1); + Log3 $hashName, 5, "Set ".$statReadingName."Last = $lastValue"; } } }