From 9cecb08a2b24c4550bb90bf158107a3cab58a9cf Mon Sep 17 00:00:00 2001 From: tpoitzsch Date: Mon, 26 May 2014 19:12:51 +0000 Subject: [PATCH] bugfix 2 git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@5979 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_statistics.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/fhem/FHEM/98_statistics.pm b/fhem/FHEM/98_statistics.pm index 87fa05964..35268147b 100644 --- a/fhem/FHEM/98_statistics.pm +++ b/fhem/FHEM/98_statistics.pm @@ -662,11 +662,15 @@ statistics_doStatisticDelta ($$$$$) # Store single readings my $singularReadings = AttrVal($name, "singularReadings", ""); if ($singularReadings ne "") { - # 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[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); + # statistics_storeSingularReadings $hashName,$singularReadings,$dev,$statReadingName,$readingName,$statType,$period,$value,$lastValue,$saveLast + $value = sprintf "%.".$decPlaces."f", $stat[1]; + statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Delta","Hour",$value,$last[1],$periodSwitch >= 1); + $value = sprintf "%.".$decPlaces."f", $stat[3]; + statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Delta","Day",$value,$last[3],$periodSwitch >= 2); + $value = sprintf "%.".$decPlaces."f", $stat[5]; + statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Delta","Month",$value,$last[5],$periodSwitch >= 3); + $value = sprintf "%.".$decPlaces."f", $stat[7]; + statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Delta","Year",$value,$last[7],$periodSwitch >= 4); } # Store hidden reading @@ -782,7 +786,7 @@ statistics_storeSingularReadings ($$$$$$$$$$) { my ($hashName,$singularReadings,$dev,$statReadingName,$readingName,$statType,$period,$statValue,$lastValue,$saveLast) = @_; return if $singularReadings eq ""; - + if ($statType eq "Delta") { $statReadingName .= $period;} else { $statReadingName .= $statType;} my $devName=$dev->{NAME};