FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-14 21:49:12 +00:00
Code Issues Releases Wiki Activity

average bug fixed

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

9
fhem/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;

19
fhem/docs/commandref.html
View File

@ -571,7 +571,7 @@ A line ending with \ will be concatenated with the next one, so long lines
"room": "Server",
"statefile": "/var/cache/fhem/fhem.save",
"verbose": "4",
"version": "=VERS= from =DATE= ($Id: fhem.pl,v 1.150 2011-08-16 18:06:38 rudolfkoenig Exp $)"
"version": "=VERS= from =DATE= ($Id: fhem.pl,v $)"
},
"READINGS": []
}
@ -2262,7 +2262,7 @@ A line ending with \ will be concatenated with the next one, so long lines
<a name="CULdefine"></a>
<b>Define</b>
<ul>
<code>define &lt;name&gt; CUL &lt;device&gt; &lt;housecode&gt;</code> <br>
<code>define &lt;name&gt; CUL &lt;device&gt; &lt;FHTID&gt;</code> <br>
<br>
USB-connected devices (CUL/CUR/CUN):<br><ul>
&lt;device&gt; specifies the serial port to communicate with the CUL or
@ -2292,8 +2292,9 @@ A line ending with \ will be concatenated with the next one, so long lines
If the device is called none, then no device will be opened, so you
can experiment without hardware attached.<br>
The housecode is a 4 digit hex number, and it is used when the CUL/CUR
talks to FHT devices or when CUR requests data.
The FHTID is a 4 digit hex number, and it is used when the CUL/CUR talks to
FHT devices or when CUR requests data. Set it to 0000 to avoid answering
any FHT80b request by the CUL.
</ul>
<br>
@ -6810,7 +6811,7 @@ href="http://www.elv.de/output/controller.aspx?cid=74&detail=10&detail2=29870">U
define a4 at *17:00:00 set lamp on # every day
# relative ones
define a5 at +00:00:10 set lamp on # switch the lamp on in 10 seconds
define a5 at +00:00:10 set lamp on # switch on in 10 seconds
define a6 at +00:00:02 set lamp on-for-timer 1 # Blink once in 2 seconds
define a7 at +*{3}00:00:02 set lamp on-for-timer 1 # Blink 3 times
@ -7022,7 +7023,15 @@ href="http://www.elv.de/output/controller.aspx?cid=74&detail=10&detail2=29870">U
define avg_temp_ws1 average .*:temperature.*
# Compute the average for all temperature and humidity events
# Events:
# ws1 temperature: 22.3
# ws1 humidity: 67.4
define avg_temp_ws1 average .*:(temperature|humidity).*
# Hunt only for the humidity: take the value from the first
# parenthesis ($1 in perl regexp) if it is a number
# Event: ws1 T: 52.3 H: 67.4
define avg_temp_ws1 average ws1:.*H:.([-\d\.]+)
</PRE>
</ul>

1
fhem/fhem.pl
View File

@ -1580,6 +1580,7 @@ GlobalAttr($$)
return "$!" if($init_done);
die "Can't open server port at $port: $!\n";
}
Log 2, "Telnet port $port opened";
close($server) if($server);
$server = $server2;
}