FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

HMInfo:Update timerdisplay

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24032 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2021-03-21 09:32:15 +00:00
parent e0dc5e8ebd
commit 9eaa848f35
1 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
fhem/FHEM/98_HMinfo.pm
View File

@ -644,7 +644,7 @@ sub HMinfo_peerCheck(@) { #####################################################
my $c = $1 eq "04"?"05":"04";
push @peerIDsNoPeer,"$eName:\t pID:".$pId if ($pId !~ m/$c$/);
if ($pMd !~ m/HM-CC-RT-DN/ ||$pChn !~ m/(0[45])$/ ){
push @peeringStrange,"$eName:\t pID: Model $pMd should be HM-CC-RT-DN ClimatTeam Channel";
push @peeringStrange,"$eName:\t pID: Model $pMd should be HM-CC-RT-DN ClimatTeam channel";
}
elsif($chn eq "04"){
# compare templist template are identical and boost is same
@ -659,7 +659,7 @@ sub HMinfo_peerCheck(@) { #####################################################
}
elsif($chn eq "02"){
if($pChn ne "02" ||$pMd ne "HM-TC-IT-WM-W-EU" ){
push @peeringStrange,"$eName:\t pID: Model $pMd should be HM-TC-IT-WM-W-EU Climate Channel";
push @peeringStrange,"$eName:\t pID: Model $pMd should be HM-TC-IT-WM-W-EU Climate channel";
}
}
}
@ -1739,7 +1739,45 @@ sub HMinfo_GetFn($@) {#########################################################
# }
elsif($cmd eq "showTimer"){
$ret = join("\n",sort map{sprintf("%8d",int($intAt{$_}{TRIGGERTIME}-gettimeofday())).":$intAt{$_}{FN}\t$intAt{$_}{ARG}"} (keys %intAt));
my ($type) = (@a,"short");# ugly way to set "full" as default
my %show;
if($type eq "short"){
%show =( NAME => 4
,TIMESPEC => 3
,fn => 1
,FW_detailFn => 4
,DeviceName => 4
);
}
else{
%show =( TYPE => 1
,NAME => 4
,TIMESPEC => 3
,PERIODIC => 2
,MODIFIER => 5
,STATE => 9
,fn => 1
,finishFn => 2
,abortFn => 3
,FW_detailFn => 4
,DeviceName => 4
);
}
my $fltr = "(".join("|",keys %show).')' ;
my @ak;
foreach my $ats (keys %intAt){
push @ak, substr(localtime($intAt{$_}{TRIGGERTIME}),0,19)
.sprintf("%8d: %-30s\t :",int($intAt{$ats}{TRIGGERTIME}-gettimeofday())
,$intAt{$ats}{FN})
.(ref($intAt{$ats}{ARG}) eq 'HASH'
? join("\t ",map{"$_ : ".$intAt{$ats}{ARG}{$_}}
map{$_=~m/^\d/?substr($_,1,99):$_}
sort
map{(my $foo = $_) =~ s/$fltr/$show{$1}$1/g; $foo;}
grep /^$fltr/,
keys %{$intAt{$ats}{ARG}})
:"$intAt{$ats}{ARG}")};
$ret = join("\n",sort @ak);
}
elsif($cmd eq "showChilds"){
my ($type) = @a;
@ -1792,7 +1830,7 @@ sub HMinfo_GetFn($@) {#########################################################
,"templateChk"
,"templateUsg"
,"templateUsgG:sortTemplate,sortPeer,noTmpl,all"
,"showTimer:noArg"
,"showTimer:short,full"
,"showChilds:hm,all"
);