Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow stateFormat

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@3365 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2013-06-30 08:55:06 +00:00
parent f785185dbb
commit e4cecbde7f
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
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: allow stateFormat
- feature: Module 70_VIERA supports now module 95_remotecontrol with own layout - feature: Module 70_VIERA supports now module 95_remotecontrol with own layout
for VIERA TV for VIERA TV
- feature: InternalVal function added (like ReadingsVal) - feature: InternalVal function added (like ReadingsVal)

19
FHEM/32_SYSSTAT.pm
View File

@ -160,9 +160,13 @@ SYSSTAT_GetUpdate($)
#my $load = $hash->{loadavg}->get; #my $load = $hash->{loadavg}->get;
my $load = SYSSTAT_getLoadAVG( $hash ); my $load = SYSSTAT_getLoadAVG( $hash );
$hash->{STATE} = $load->{avg_1} . " " . $load->{avg_5} . " " . $load->{avg_15} if( defined($load->{avg_1}) ); readingsBeginUpdate($hash);
readingsSingleUpdate($hash,"load",$load->{avg_1},defined($hash->{LOCAL} ? 0 : 1)); my $state = $load->{avg_1} . " " . $load->{avg_5} . " " . $load->{avg_15} if( defined($load->{avg_1}) );
readingsBulkUpdate($hash,"state",$state);
readingsBulkUpdate($hash,"load",$load->{avg_1});
my $do_diskusage = 1; my $do_diskusage = 1;
if( defined($hash->{INTERVAL_FS} ) ) { if( defined($hash->{INTERVAL_FS} ) ) {
@ -188,14 +192,14 @@ SYSSTAT_GetUpdate($)
if( AttrVal($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)); readingsBulkUpdate($hash,$fs->{mountpoint},$fs->{$type});
} }
} else { } else {
for my $filesystem (@{$hash->{filesystems}}) { for my $filesystem (@{$hash->{filesystems}}) {
foreach my $key (keys %$usage) { foreach my $key (keys %$usage) {
if( $key =~ /$filesystem/ ) { if( $key =~ /$filesystem/ ) {
my $fs = $usage->{$key}; my $fs = $usage->{$key};
readingsSingleUpdate($hash,$fs->{mountpoint},$fs->{$type},defined($hash->{LOCAL} ? 0 : 1)); readingsBulkUpdate($hash,$fs->{mountpoint},$fs->{$type});
} }
} }
} }
@ -208,14 +212,16 @@ SYSSTAT_GetUpdate($)
if( AttrVal($name, "raspberrytemperature", "0") eq 2 ) { if( AttrVal($name, "raspberrytemperature", "0") eq 2 ) {
$temp = sprintf( "%.1f", (3 * ReadingsVal($name,"temperature",$temp) + $temp ) / 4 ); $temp = sprintf( "%.1f", (3 * ReadingsVal($name,"temperature",$temp) + $temp ) / 4 );
} }
readingsSingleUpdate($hash,"temperature",$temp,defined($hash->{LOCAL} ? 0 : 1)); readingsBulkUpdate($hash,"temperature",$temp);
} }
} }
if( AttrVal($name, "raspberrycpufreq", "0") > 0 ) { if( AttrVal($name, "raspberrycpufreq", "0") > 0 ) {
my $freq = SYSSTAT_getPiFreq($hash); my $freq = SYSSTAT_getPiFreq($hash);
readingsSingleUpdate($hash,"cpufreq",$freq,defined($hash->{LOCAL} ? 0 : 1)); readingsBulkUpdate($hash,"cpufreq",$freq);
} }
readingsEndUpdate($hash,defined($hash->{LOCAL} ? 0 : 1));
} }
sub sub
@ -415,6 +421,7 @@ SYSSTAT_getPiFreq( $ )
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>
The username for ssh remote access.</li> The username for ssh remote access.</li>
<li>readingFnAttributes</li>
</ul> </ul>
</ul> </ul>