2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00

inprove peerXref

git-svn-id: https://svn.fhem.de/fhem/trunk@6408 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-08-15 10:42:33 +00:00
parent b0fd55782d
commit ea72cbe11a

View File

@ -386,7 +386,7 @@ sub HMinfo_peerCheck(@) { #####################################################
keys %{$defs{$eName}{READINGS}})){
push @peerIDsTrigUnp,"triggerUnpeered: ".$eName.":".$_
if( ($peerIDs && $peerIDs !~ m/$_/)
||("CCU-FHEM" ne AttrVal(CUL_HM_id2Name(substr($_,0,6)),"model","")));
||("CCU-FHEM" ne AttrVal(CUL_HM_id2Name($_),"model","")));
push @peerIDsTrigUnd,"triggerUndefined: ".$eName.":".$_
if(!$modules{CUL_HM}{defptr}{$_});
}
@ -889,12 +889,17 @@ sub HMinfo_GetFn($@) {#########################################################
my @fheml = ();
foreach my $dName (HMinfo_getEntities($opt,$filter)){
# search for irregular trigger
my @failTrig = map {"$dName: $_"}
grep /^trigDst_/,
keys %{$defs{$dName}{READINGS}};
push @peerUndef,@failTrig if (@failTrig);
#--- check regular references
my $peerIDs = AttrVal($dName,"peerIDs",undef);
foreach (grep /^......$/, HMinfo_noDup(map {CUL_HM_name2Id(substr($_,8))}
grep /^trigDst_/,
keys %{$defs{$dName}{READINGS}})){
push @peerUndef,"$dName triggers $_"
if( ($peerIDs && $peerIDs !~ m/$_/)
||("CCU-FHEM" ne AttrVal(CUL_HM_id2Name($_),"model","")));
}
#--- check regular references
next if(!$peerIDs);
my $dId = unpack 'A6',CUL_HM_name2Id($dName);
my @pl = ();