FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 01:46:08 +00:00
Code Issues Releases Wiki Activity

HMInfo:bugfix configCheck

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23776 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2021-02-20 11:02:40 +00:00
parent 3739c84c54
commit 802cc0841f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/98_HMinfo.pm
View File

@ -583,15 +583,15 @@ sub HMinfo_peerCheck(@) { #####################################################
foreach (grep /^......$/, HMinfo_noDup(map {CUL_HM_name2Id(substr($_,8))} foreach (grep /^......$/, HMinfo_noDup(map {CUL_HM_name2Id(substr($_,8))}
grep /^trigDst_/, grep /^trigDst_/,
keys %{$defs{$eName}{READINGS}})){ keys %{$defs{$eName}{READINGS}})){
push @peerIDsTrigUnp,"triggerUnpeered: $eName:\t".$_ push @peerIDsTrigUnp,"$eName:\t".$_
if( ($peerIDs && $peerIDs !~ m/$_/) if( ($peerIDs && $peerIDs !~ m/$_/)
&&("CCU-FHEM" ne AttrVal(CUL_HM_id2Name($_),"model",""))); &&("CCU-FHEM" ne AttrVal(CUL_HM_id2Name($_),"model","")));
push @peerIDsTrigUnd,"triggerUndefined: $eName:\t".$_ push @peerIDsTrigUnd,"$eName:\t".$_
if(!$modules{CUL_HM}{defptr}{$_}); if(!$modules{CUL_HM}{defptr}{$_});
} }
if($peersUsed == 2){#peerList incomplete if($peersUsed == 2){#peerList incomplete
push @peerIDsFail,"incomplete: $eName:\t".$peerIDs; push @peerIDsFail,"$eName:\t".$peerIDs;
} }
else{# work on a valid list else{# work on a valid list
my $id = $defs{$eName}{DEF}; my $id = $defs{$eName}{DEF};
@ -1312,8 +1312,8 @@ sub HMinfo_GetFn($@) {#########################################################
} }
elsif($_ =~m /^[ ,0-9]{1,5}/){ elsif($_ =~m /^[ ,0-9]{1,5}/){
my ($cnt,$date) = split(":",$_,2); my ($cnt,$date) = split(":",$_,2);
$_ = sprintf("%-5s>%s",$cnt,$date) if (defined $date); #$_ = sprintf("%-5s>%s",$cnt,$date) if (defined $date);
$plSum[$c] +=$cnt; $plSum[$c] +=$cnt if ($cnt =~ m/^\d+$/);
} }
else{ else{
} }
@ -1451,10 +1451,12 @@ sub HMinfo_GetFn($@) {#########################################################
elsif($cmd eq "regCheck") {##check register-------------------------------- elsif($cmd eq "regCheck") {##check register--------------------------------
my @entities = HMinfo_getEntities($opt."v",$filter); my @entities = HMinfo_getEntities($opt."v",$filter);
$ret = $cmd." done:" .HMinfo_regCheck(@entities); $ret = $cmd." done:" .HMinfo_regCheck(@entities);
$ret = HMinfo_applTxt2Check($ret);
} }
elsif($cmd eq "peerCheck") {##check peers----------------------------------- elsif($cmd eq "peerCheck") {##check peers-----------------------------------
my @entities = HMinfo_getEntities($opt,$filter); my @entities = HMinfo_getEntities($opt,$filter);
$ret = $cmd." done:" .HMinfo_peerCheck(@entities); $ret = $cmd." done:" .HMinfo_peerCheck(@entities);
$ret = HMinfo_applTxt2Check($ret);
} }
elsif($cmd eq "configCheck"){##check peers and register---------------------- elsif($cmd eq "configCheck"){##check peers and register----------------------
if($modules{HMinfo}{helper}{initDone}){ if($modules{HMinfo}{helper}{initDone}){