From: Jan Michel <j.michel@gsi.de> Date: Thu, 27 Aug 2015 18:21:15 +0000 (+0200) Subject: removed averaging. Now done in uC X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=cc050f1e615ecda1019e15b862d29b904be15f19;p=labtools.git removed averaging. Now done in uC --- diff --git a/sensors/update.pl b/sensors/update.pl index dcef996..5362d07 100755 --- a/sensors/update.pl +++ b/sensors/update.pl @@ -93,15 +93,15 @@ while (my $line = <$tdata>) { next if $2 >= 8; my $v = hex($4); $v -= 0x100000 if $v >= 0x80000; - $values->[$1*8+$2] += $v/1000.; - $count->[$1*8+$2]++; + $values->[$1*8+$2] = $v/1000.; +# $count->[$1*8+$2]++; $values->[$1*8+$2] = undef if $3; } } -for (my $i = 0; $i < scalar @{$values};$i++){ - $values->[$i] = $values->[$i] / $count->[$i] if defined $values->[$i]; - } +#for (my $i = 0; $i < scalar @{$values};$i++){ +# $values->[$i] = $values->[$i] / $count->[$i] if defined $values->[$i]; +# } defineScale($values); @@ -118,10 +118,10 @@ while (my $line = <$cdata>) { print " <div class=\"sensor\" id=\"$f[0].$f[1]\" style=\"left:".($f[3]*20)."px;top:".($f[2]*20)."px;background:".findcolor($values->[$f[0]*8+$f[1]],$min,$max)."\"> <div class=\"value\">$val</div> - <div class=\"sid\">$f[0].$f[1]/".($count->[$f[0]*8+$f[1]]||0)."</div> + <div class=\"sid\">$f[0].$f[1]</div> <div class=\"name\">$f[4]</div> </div> - "; + ";##/($count->[$f[0]*8+$f[1]]||0) } }