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

HMinfo:correct Burst detection

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16931 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2018-07-01 19:17:12 +00:00
parent aeacf56bae
commit 9a284c3ea7
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fhem/FHEM/98_HMinfo.pm
View File

@ -1175,18 +1175,25 @@ sub HMinfo_GetFn($@) {#########################################################
$maxNlen = $nl if($nl > $maxNlen); $maxNlen = $nl if($nl > $maxNlen);
my ($found,$para) = HMinfo_getParam($id, my ($found,$para) = HMinfo_getParam($id,
,"protState","protCmdPend","protSnd" ,"protState","protCmdPend","protSnd"
,"protSndB","protLastRcv" ,"protSndB","protRcv","protRcvB"
,"protResnd","protCmdDel","protResndFail","protNack","protIOerr"); ,"protResnd","protCmdDel","protResndFail","protNack","protIOerr");
$para =~ s/( last_at|20..-|\|)//g; $para =~ s/( last_at|20..-|\|)//g;
my @pl = split "\t",$para; my @pl = split "\t",$para;
foreach (@pl){ foreach (@pl){
$_ =~ s/\s+$|//g ; $_ =~ s/\s+$|//g ;
$_ =~ s/CMDs_//; $_ =~ s/CMDs_//;
$_ =~ s/:*..-.. ..:..:..//g if ($type eq "short");
if ($type eq "short"){
$_ =~ s/:*..-.. ..:..:..//g;# if ($type eq "short");
}
elsif($_ =~m /^[ ,0-9]{1,5}:/)
{my ($cnt,$date) = split(":",$_,2);
$_ = sprintf("%-5s%s",$cnt,$date);
}
$_ =~ s/CMDs // if ($type eq "short"); $_ =~ s/CMDs // if ($type eq "short");
} }
for (1..9){ for (1..11){
my ($x) = $pl[$_] =~ /(\d+)/; my ($x) = $pl[$_] =~ /(\d+)/;
$plSum[$_] += $x if ($x); $plSum[$_] += $x if ($x);
} }
@ -1198,7 +1205,7 @@ sub HMinfo_GetFn($@) {#########################################################
my @paramList; my @paramList;
if ($type eq "short"){ if ($type eq "short"){
push @paramList, sprintf("%-${maxNlen}s%-17s|%-10s|%-10s|%-10s#%-10s|%-10s|%-10s|%-10s", push @paramList, sprintf("%-${maxNlen}s%-17s|%-10s|%-10s|%-10s#%-10s|%-10s|%-10s|%-10s",
@{$_}[0..3],@{$_}[6..10]) foreach(@paramList2); @{$_}[0..3],@{$_}[7..11]) foreach(@paramList2);
$hdr = sprintf("%-${maxNlen}s:%-16s|%-10s|%-10s|%-10s#%-10s|%-10s|%-10s|%-10s", $hdr = sprintf("%-${maxNlen}s:%-16s|%-10s|%-10s|%-10s#%-10s|%-10s|%-10s|%-10s",
,"name","State","CmdPend" ,"name","State","CmdPend"
,"Snd" ,"Snd"
@ -1207,15 +1214,15 @@ sub HMinfo_GetFn($@) {#########################################################
$ftr = sprintf("%-${maxNlen}s%-17s|%-10s|%-10s|%-10s#%-10s|%-10s|%-10s|%-10s","sum",@plSum[1..3],@plSum[5..9]); $ftr = sprintf("%-${maxNlen}s%-17s|%-10s|%-10s|%-10s#%-10s|%-10s|%-10s|%-10s","sum",@plSum[1..3],@plSum[5..9]);
} }
else{ else{
push @paramList, sprintf("%-${maxNlen}s%-17s|%-18s|%-19s|%-18s|%-15s|%-18s#%-18s|%-18s|%-18s|%-18s", push @paramList, sprintf("%-${maxNlen}s%-17s|%-18s|%-19s|%-19s|%-19s|%-19s|%-19s#%-18s|%-19s|%-19s|%-19s",
@{$_}[0..10]) foreach(@paramList2); @{$_}[0..10]) foreach(@paramList2);
$hdr = sprintf("%-${maxNlen}s:%-16s|%-18s|%-19s|%-18s|%-15s|%-18s#%-18s|%-18s|%-18s|%-18s", $hdr = sprintf("%-${maxNlen}s:%-16s|%-18s|%-19s|%-19s|%-19s|%-19s|%-19s#%-18s|%-19s|%-19s|%-19s",
,"name","State","CmdPend" ,"name","State","CmdPend"
,"Snd" ,"Snd"
,"SndB","LastRcv" ,"SndB","Rcv","RcvB"
,"Resnd" ,"Resnd"
,"CmdDel","ResndFail","Nack","IOerr"); ,"CmdDel","ResndFail","Nack","IOerr");
$ftr = sprintf("%-${maxNlen}s%-17s|%-18s|%-19s|%-18s|%-15s|%-18s#%-18s|%-18s|%-18s|%-18s","sum",@plSum[1..9]); $ftr = sprintf("%-${maxNlen}s%-17s|%-18s|%-19s|%-19s|%-19s|%-19s|%-19s#%-18s|%-19s|%-19s|%-19s","sum",@plSum[1..9]);
} }
$ret = $cmd." send to devices done:" $ret = $cmd." send to devices done:"