mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

average bug fixed

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@1129 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2011-12-14 07:54:46 +00:00
parent f3420200fa
commit e256dfaa25
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
FHEM/98_average.pm
View File

@@ -60,9 +60,11 @@ average_Notify($$)
next if(!defined($s));
my ($evName, $val) = split(" ", $s, 2); # resets $1
next if($devName !~ m/^$re$/ && "$devName:$s" !~ m/^$re$/ || $s =~ m/_avg_/);
$val = $1 if(defined($1));
next if(!defined($val) || $val !~ m/^(\d+\.?\d*)/);
$val = $1;
if(defined($1)) {
my $reArg = $1;
$val = $reArg if(defined($reArg) && $reArg =~ m/^(-?\d+\.?\d*)/);
}
next if(!defined($val) || $val !~ m/^(-?\d+\.?\d*)/);
################
# Avg computing
@@ -96,7 +98,6 @@ average_Notify($$)
my $cum = $r->{$cumName}{VAL} + ($secNow-$secLast) * $val;
$r->{$cumName}{VAL} = $cum;
$r->{$avgName}{VAL} = sprintf("%0.1f", $cum/$secNow);
} else {
$trigger .= " $avgName:".$r->{$avgName}{VAL};
$r->{$cumName}{VAL} = $secNow*$val;