FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 19:36:02 +00:00
Code Issues Releases Wiki Activity

HMInfo: new option for alias names

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11997 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2016-08-19 21:30:40 +00:00
parent bb7d580b02
commit 156b73b190
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fhem/FHEM/98_HMinfo.pm
View File

@ -17,6 +17,7 @@ sub HMinfo_register ($);
use Blocking; use Blocking;
use HMConfig; use HMConfig;
my $doAli = 0;#display alias names as well (filter option 2)
sub HMinfo_Initialize($$) {#################################################### sub HMinfo_Initialize($$) {####################################################
my ($hash) = @_; my ($hash) = @_;
@ -1047,9 +1048,8 @@ sub HMinfo_tempListTmplGenGplot(@) { ##########################################
sub HMinfo_getEntities(@) { ################################################### sub HMinfo_getEntities(@) { ###################################################
my ($filter,$re) = @_; my ($filter,$re) = @_;
my @names; my @names;
my ($doDev,$doChn,$doIgn,$noVrt,$noPhy,$noAct,$noSen,$doEmp); my ($doDev,$doChn,$doEmp)= (1,1,1,1,1,1,1,1);
$doDev=$doChn=$doEmp= 1; my ($doIgn,$noVrt,$noPhy,$noAct,$noSen) = (0,0,0,0,0,0,0,0,0,0);
$doIgn=$noVrt=$noPhy=$noAct=$noSen = 0;
$filter .= "dc" if ($filter !~ m/d/ && $filter !~ m/c/); # add default $filter .= "dc" if ($filter !~ m/d/ && $filter !~ m/c/); # add default
$re = '.' if (!$re); $re = '.' if (!$re);
if ($filter){# options provided if ($filter){# options provided
@ -1066,6 +1066,7 @@ sub HMinfo_getEntities(@) { ###################################################
$noAct = 1 if($_ eq 'a'); $noAct = 1 if($_ eq 'a');
$noSen = 1 if($_ eq 's'); $noSen = 1 if($_ eq 's');
$doEmp = 1 if($_ eq 'e'); $doEmp = 1 if($_ eq 'e');
$doAli = 1 if($_ eq '2');
} }
} }
# generate entity list # generate entity list
@ -1132,6 +1133,7 @@ sub HMinfo_GetFn($@) {#########################################################
my ($hash,$name,$cmd,@a) = @_; my ($hash,$name,$cmd,@a) = @_;
my ($opt,$optEmpty,$filter) = ("",1,""); my ($opt,$optEmpty,$filter) = ("",1,"");
my $ret; my $ret;
$doAli = 0;#set default
if (@a && ($a[0] =~ m/^-/) && ($a[0] !~ m/^-f$/)){# options provided if (@a && ($a[0] =~ m/^-/) && ($a[0] !~ m/^-f$/)){# options provided
$opt = $a[0]; $opt = $a[0];
@ -1255,8 +1257,10 @@ sub HMinfo_GetFn($@) {#########################################################
$dispDest .= "/$h->{NAME}"; $dispDest .= "/$h->{NAME}";
} }
if ($type eq "full"){ if ($type eq "full"){
push @rssiList,sprintf("%-15s %-15s %-15s %6.1f %6.1f %6.1f<%6.1f %5s" push @rssiList,sprintf("%-15s ",$dName)
,$dName,$dispName,$dispDest .($doAli ? sprintf("%-15s ",AttrVal($dName,"alias","-")):"")
.sprintf("%-15s %-15s %6.1f %6.1f %6.1f<%6.1f %5s"
,$dispName,$dispDest
,$defs{$dName}{helper}{rssi}{$dest}{lst} ,$defs{$dName}{helper}{rssi}{$dest}{lst}
,$defs{$dName}{helper}{rssi}{$dest}{avg} ,$defs{$dName}{helper}{rssi}{$dest}{avg}
,$defs{$dName}{helper}{rssi}{$dest}{min} ,$defs{$dName}{helper}{rssi}{$dest}{min}
@ -1281,12 +1285,8 @@ sub HMinfo_GetFn($@) {#########################################################
foreach my $d(keys %rssiH){ foreach my $d(keys %rssiH){
my $str = sprintf("%-15s ",$d); my $str = sprintf("%-15s ",$d);
$str .= sprintf("%-15s ",AttrVal($d,"alias","-"))if ($doAli);
foreach my $i(@io){ foreach my $i(@io){
# $str .= sprintf(" %6.1f/%6.1f/%6.1f"
# ,($rssiH{$d}{$i}{min} ? $rssiH{$d}{$i}{min} : 0)
# ,($rssiH{$d}{$i}{avg} ? $rssiH{$d}{$i}{avg} : 0)
# ,($rssiH{$d}{$i}{max} ? $rssiH{$d}{$i}{max} : 0)
# );
$str .= sprintf(" %12.1f" $str .= sprintf(" %12.1f"
# ,($rssiH{$d}{$i}{min} ? $rssiH{$d}{$i}{min} : 0) # ,($rssiH{$d}{$i}{min} ? $rssiH{$d}{$i}{min} : 0)
,($rssiH{$d}{$i}{avg} ? $rssiH{$d}{$i}{avg} : 0) ,($rssiH{$d}{$i}{avg} ? $rssiH{$d}{$i}{avg} : 0)
@ -1299,7 +1299,7 @@ sub HMinfo_GetFn($@) {#########################################################
.(join "\n ",sort @rssiList); .(join "\n ",sort @rssiList);
} }
elsif($type eq "full"){ elsif($type eq "full"){
$ret = $cmd." done:"."\n "."Device receive from last avg min_max count" $ret = $cmd." done:"."\n "."Device ".($doAli?"Alias ":"")."receive from last avg min_max count"
."\n ".(join "\n ",sort @rssiList) ."\n ".(join "\n ",sort @rssiList)
; ;
} }
@ -1486,6 +1486,8 @@ sub HMinfo_SetFn($@) {#########################################################
my @in = @a; my @in = @a;
my ($opt,$optEmpty,$filter) = ("",1,""); my ($opt,$optEmpty,$filter) = ("",1,"");
my $ret; my $ret;
$doAli = 0;#set default
if (@a && ($a[0] =~ m/^-/) && ($a[0] !~ m/^-f$/)){# options provided if (@a && ($a[0] =~ m/^-/) && ($a[0] !~ m/^-f$/)){# options provided
$opt = $a[0]; $opt = $a[0];
$optEmpty = ($opt =~ m/e/)?1:0; $optEmpty = ($opt =~ m/e/)?1:0;
@ -2699,6 +2701,7 @@ sub HMinfo_noDup(@) {#return list with no duplicates###########################
<li>a - aktor :supress actor</li> <li>a - aktor :supress actor</li>
<li>s - sensor :supress sensor</li> <li>s - sensor :supress sensor</li>
<li>e - empty :include results even if requested fields are empty</li> <li>e - empty :include results even if requested fields are empty</li>
<li>2 - alias :display second name alias</li>
</ul> </ul>
and/or filter for <b>names</b>:<br> and/or filter for <b>names</b>:<br>
<ul> <ul>
@ -3147,6 +3150,7 @@ sub HMinfo_noDup(@) {#return list with no duplicates###########################
<li>a - aktor :unterdr&uuml;cke Aktor</li> <li>a - aktor :unterdr&uuml;cke Aktor</li>
<li>s - sensor :unterdr&uuml;cke Sensor</li> <li>s - sensor :unterdr&uuml;cke Sensor</li>
<li>e - empty :verwendet das Resultat auch wenn die Felder leer sind</li> <li>e - empty :verwendet das Resultat auch wenn die Felder leer sind</li>
<li>2 - alias :2ter name alias anzeigen</li>
</ul> </ul>
und/oder <b>Name</b>:<br> und/oder <b>Name</b>:<br>
<ul> <ul>