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

98_fheminfo.pm: add special handling for ZWave

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14615 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen
2017-07-01 12:09:15 +00:00
parent 78915dd8af
commit 158e90fc01
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
fhem/FHEM/98_fheminfo.pm
View File

@@ -25,11 +25,14 @@ use warnings;
use Config; use Config;
use HttpUtils; use HttpUtils;
my %fhemInfo =();
my $c_system = 'system'; my $c_system = 'system';
my $c_noModel = 'noModel'; my $c_noModel = 'noModel';
my %fhemInfo =();
my @ignoreList = qw(Global);
my @countOnce = qw(telnet FHEMWEB);
sub fheminfo_Initialize($$) { sub fheminfo_Initialize($$) {
my %hash = ( my %hash = (
Fn => "CommandFheminfo", Fn => "CommandFheminfo",
@@ -53,6 +56,8 @@ sub CommandFheminfo($$) {
_fi2_Count(); _fi2_Count();
return toJSON(\%fhemInfo) if (defined($args[1]) && $args[1] eq 'debug');
_fi2_Send() if $args[0] eq 'send'; _fi2_Send() if $args[0] eq 'send';
# do not return statistics data if called from update # do not return statistics data if called from update
@@ -91,15 +96,31 @@ sub _fi2_Count() {
my $model = $c_noModel; my $model = $c_noModel;
$model = defined($defs{$key}{model}) ? $defs{$key}{model} : $model; $model = defined($defs{$key}{model}) ? $defs{$key}{model} : $model;
$model = defined($defs{$key}{MODEL}) ? $defs{$key}{MODEL} : $model; $model = defined($defs{$key}{MODEL}) ? $defs{$key}{MODEL} : $model;
$model = defined($defs{$key}{DBMODEL}) ? $defs{$key}{DBMODEL} : $model; # special for DbLog
$model = defined($defs{$key}{DBMODEL}) ? $defs{$key}{DBMODEL} : $model
if ($type eq 'DbLog');
$model = AttrVal($name,'model',$model); $model = AttrVal($name,'model',$model);
$model = ReadingsVal($name,'model',$model); $model = ReadingsVal($name,'model',$model);
# special for ZWave
$model = ReadingsVal($name,'modelId',$model)
if ($type eq 'ZWave');
$model = $c_noModel if (ref $model); $model = $c_noModel if (ref $model);
next if ( ($model =~ /^unkno.*/i) || ($model =~ /virtual.*/i) || ($model eq '?') || ($model eq '1') || next if ( ($model =~ /^unkno.*/i) || ($model =~ /virtual.*/i) || ($model eq '?') || ($model eq '1') ||
(defined($defs{$key}{'chanNo'})) || ($name =~ m/^unknown_/) ); (defined($defs{$key}{'chanNo'})) || ($name =~ m/^unknown_/) );
$fhemInfo{$type}{$model}++ ; $fhemInfo{$type}{$model}++ ;
} }
# now do some special handlings
# add model info for configDB if used
eval { $fhemInfo{'configDB'}{_cfgDB_type()}++ if configDBUsed(); }; eval { $fhemInfo{'configDB'}{_cfgDB_type()}++ if configDBUsed(); };
# correct some entries for special devices; count once per installation
foreach my $i (@countOnce) { $fhemInfo{$i}{$c_noModel} = 1; }
# delete all modules listed in ignoreList
foreach my $i (@ignoreList) { delete $fhemInfo{$i}; }
return; return;
} }
@@ -175,6 +196,7 @@ sub _fi2_HtmlTable($) {
foreach my $type (sort @keys) foreach my $type (sort @keys)
{ {
next if ($type eq $c_system); next if ($type eq $c_system);
$fhemInfo{$type}{$c_noModel} //= '';
$result .= "<tr><td>$type</td><td> </td><td>$fhemInfo{$type}{$c_noModel}</td></tr>"; $result .= "<tr><td>$type</td><td> </td><td>$fhemInfo{$type}{$c_noModel}</td></tr>";
while ( my ($model, $count) = each(%{$fhemInfo{$type}}) ) while ( my ($model, $count) = each(%{$fhemInfo{$type}}) )
{ $result .= "<tr><td> </td><td>$model</td><td>$fhemInfo{$type}{$model}</td></tr>" unless $model eq $c_noModel; } { $result .= "<tr><td> </td><td>$model</td><td>$fhemInfo{$type}{$model}</td></tr>" unless $model eq $c_noModel; }