FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

optionaly calculate geometric average of last 4 temperature values

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3149 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2013-05-03 18:43:29 +00:00
parent 7e4e316534
commit 89c9ef0d14
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII # Add changes at the top of the list. Keep it in ASCII
- SVN - SVN
- feature: SYSSTAT: optionaly calculate geometric average of last 4 temperature values
- feature: weblink details screen can be used to edit .gplot files - feature: weblink details screen can be used to edit .gplot files
- feature: eventTypes module added, to help with FileLog details screen - feature: eventTypes module added, to help with FileLog details screen
- feature: FB_CALLMONITOR: new reverse search provider dasschnelle.at for - feature: FB_CALLMONITOR: new reverse search provider dasschnelle.at for

20
fhem/FHEM/32_SYSSTAT.pm
View File

@ -15,7 +15,7 @@ SYSSTAT_Initialize($)
$hash->{UndefFn} = "SYSSTAT_Undefine"; $hash->{UndefFn} = "SYSSTAT_Undefine";
$hash->{GetFn} = "SYSSTAT_Get"; $hash->{GetFn} = "SYSSTAT_Get";
$hash->{AttrFn} = "SYSSTAT_Attr"; $hash->{AttrFn} = "SYSSTAT_Attr";
$hash->{AttrList} = "filesystems raspberrytemperature:1 showpercent:1 useregex:1 ssh_user loglevel:0,1,2,3,4,5,6 ". $hash->{AttrList} = "filesystems raspberrytemperature:0,1,2 showpercent:1 useregex:1 ssh_user loglevel:0,1,2,3,4,5,6 ".
$readingFnAttributes; $readingFnAttributes;
} }
@ -121,7 +121,6 @@ SYSSTAT_Attr($$$)
my $orig = $attrVal; my $orig = $attrVal;
$attrVal= "1" if($attrName eq "useregex"); $attrVal= "1" if($attrName eq "useregex");
$attrVal= "1" if($attrName eq "showpercent"); $attrVal= "1" if($attrName eq "showpercent");
$attrVal= "1" if($attrName eq "raspberrytemperature");
if( $attrName eq "filesystems") { if( $attrName eq "filesystems") {
my $hash = $defs{$name}; my $hash = $defs{$name};
@ -149,6 +148,7 @@ sub
SYSSTAT_GetUpdate($) SYSSTAT_GetUpdate($)
{ {
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME};
if(!$hash->{LOCAL}) { if(!$hash->{LOCAL}) {
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
@ -179,11 +179,11 @@ SYSSTAT_GetUpdate($)
my $usage = $hash->{diskusage}->get; my $usage = $hash->{diskusage}->get;
my $type = 'free'; my $type = 'free';
if( AttrVal($hash->{NAME}, "showpercent", "") ne "" ) { if( AttrVal($name, "showpercent", "") ne "" ) {
$type = 'usageper'; $type = 'usageper';
} }
if( AttrVal($hash->{NAME}, "useregex", "") eq "" ) { if( AttrVal($name, "useregex", "") eq "" ) {
for my $filesystem (@{$hash->{filesystems}}) { for my $filesystem (@{$hash->{filesystems}}) {
my $fs = $usage->{$filesystem}; my $fs = $usage->{$filesystem};
readingsSingleUpdate($hash,$fs->{mountpoint},$fs->{$type},defined($hash->{LOCAL} ? 0 : 1)); readingsSingleUpdate($hash,$fs->{mountpoint},$fs->{$type},defined($hash->{LOCAL} ? 0 : 1));
@ -200,9 +200,14 @@ SYSSTAT_GetUpdate($)
} }
} }
if( AttrVal($hash->{NAME}, "raspberrytemperature", "") ne "" ) { if( AttrVal($name, "raspberrytemperature", "0") > 0 ) {
my $temp = SYSSTAT_getPiTemp($hash); my $temp = SYSSTAT_getPiTemp($hash);
readingsSingleUpdate($hash,"temperature",$temp,defined($hash->{LOCAL} ? 0 : 1)) if( $temp > 0 && $temp < 200 ); if( $temp > 0 && $temp < 200 ) {
if( AttrVal($name, "raspberrytemperature", "0") eq 2 ) {
$temp = sprintf( "%.1f", (3 * ReadingsVal($name,"temperature",$temp) + $temp ) / 4 );
}
readingsSingleUpdate($hash,"temperature",$temp,defined($hash->{LOCAL} ? 0 : 1));
}
} }
} }
@ -363,7 +368,8 @@ SYSSTAT_getPiTemp( $ )
<li>showpercent<br> <li>showpercent<br>
If set the usage is shown in percent. If not set the remaining free space in bytes is shown.</li> If set the usage is shown in percent. If not set the remaining free space in bytes is shown.</li>
<li>raspberrytemperature<br> <li>raspberrytemperature<br>
If set the raspberry pi on chip termal sensor is read.</li> If set and > 0 the raspberry pi on chip termal sensor is read.<br>
If set to 2 a geometric average over the last 4 values is created.</li>
<li>useregex<br> <li>useregex<br>
If set the entries of the filesystems list are treated as regex.</li> If set the entries of the filesystems list are treated as regex.</li>
<li>ssh_user<br> <li>ssh_user<br>