FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 11:26:55 +00:00
Code Issues Releases Wiki Activity

CUL_HM:peer handling bug

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23644 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2021-01-30 16:22:42 +00:00
parent 5c30778d25
commit 324966281f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/FHEM/10_CUL_HM.pm
View File

@ -4439,7 +4439,7 @@ sub CUL_HM_SetList($$) {#+++++++++++++++++ get command basic list+++++++++++++++
push @cond,"slider,0,1,255" if (!scalar @cond); push @cond,"slider,0,1,255" if (!scalar @cond);
$hash->{helper}{cmds}{lst}{condition} = join(",",sort grep /./,@cond); $hash->{helper}{cmds}{lst}{condition} = join(",",sort grep /./,@cond);
$hash->{helper}{cmds}{lst}{peer} = join",",sort CUL_HM_getPeers($name,"Names"); $hash->{helper}{cmds}{lst}{peer} = join",",sort (CUL_HM_getPeers($name,"Names"));
if (grep /^press:/,@arr1){ if (grep /^press:/,@arr1){
if ($roleV){ if ($roleV){
push @arr1,"pressS:[(-peer-|{all})]"; push @arr1,"pressS:[(-peer-|{all})]";
@ -8170,7 +8170,7 @@ sub CUL_HM_ID2PeerList ($$$) { # {CUL_HM_ID2PeerList ("lvFrei","12345678",1)}
if ($st eq "virtual"){ if ($st eq "virtual"){
#if any of the peers is an SD we are team master #if any of the peers is an SD we are team master
my ($tMstr,$tcSim,$thSim) = (0,0,0); my ($tMstr,$tcSim,$thSim) = (0,0,0);
foreach (CUL_HM_getPeers($name,"Names" )){ foreach (CUL_HM_getPeers($name,"NamesExt" )){
if(AttrVal($_,"subType","") eq "smokeDetector"){#have smoke detector if(AttrVal($_,"subType","") eq "smokeDetector"){#have smoke detector
$tMstr = AttrVal($_,"model","") eq "HM-SEC-SD-2"? 2:1;#differentiate SD and SD2 $tMstr = AttrVal($_,"model","") eq "HM-SEC-SD-2"? 2:1;#differentiate SD and SD2
} }
@ -9242,7 +9242,9 @@ sub CUL_HM_getPeers($$) { #return peering information - status and lists
elsif ($type eq "Names" ){return map{$hashH->{peerIDsH}{$_}} grep!/00000000/ ,keys%{$hashH->{peerIDsH}};}#all peer names elsif ($type eq "Names" ){return map{$hashH->{peerIDsH}{$_}} grep!/00000000/ ,keys%{$hashH->{peerIDsH}};}#all peer names
elsif ($type eq "IDsExt" ){return grep!/(00000000|$devId)/,keys%{$hashH->{peerIDsH}};}#only external peers elsif ($type eq "IDsExt" ){return grep!/(00000000|$devId)/,keys%{$hashH->{peerIDsH}};}#only external peers
elsif ($type eq "IDsSelf" ){return grep /$devId/ ,keys%{$hashH->{peerIDsH}};}#only own peers elsif ($type eq "IDsSelf" ){return grep /$devId/ ,keys%{$hashH->{peerIDsH}};}#only own peers
elsif ($type eq "NamesExt" ){return map{$hashH->{peerIDsH}{$_}} grep!/(00000000|$devId)/,keys%{$hashH->{peerIDsH}};}#all external names elsif ($type eq "NamesExt" ){return grep/./,map{(my $foo = $hashH->{peerIDsH}{$_}) =~ s/_chn-..$//;
defined($defs{$foo})?$foo:""}
grep!/(00000000|$devId)/,keys%{$hashH->{peerIDsH}};}#all external names
elsif ($type eq "NamesSelf" ){return map{$hashH->{peerIDsH}{$_}} grep /$devId/ ,keys%{$hashH->{peerIDsH}};}#all own names elsif ($type eq "NamesSelf" ){return map{$hashH->{peerIDsH}{$_}} grep /$devId/ ,keys%{$hashH->{peerIDsH}};}#all own names
elsif ($type eq "IDsRaw" ){return keys%{$hashH->{peerIDsH}};} elsif ($type eq "IDsRaw" ){return keys%{$hashH->{peerIDsH}};}
elsif ($type eq "Status" ){ elsif ($type eq "Status" ){
@ -9271,7 +9273,7 @@ sub CUL_HM_getPeers($$) { #return peering information - status and lists
elsif ($type =~ m/^ID:(.{8})$/ ){return $hashH->{peerIDsH}{$1} if (defined $hashH->{peerIDsH}{$1});} elsif ($type =~ m/^ID:(.{8})$/ ){return $hashH->{peerIDsH}{$1} if (defined $hashH->{peerIDsH}{$1});}
elsif ($type =~ m/^ID:(.{6})$/ ){return grep /$1../ ,keys%{$hashH->{peerIDsH}};}#peers for a device elsif ($type =~ m/^ID:(.{6})$/ ){return grep /$1../ ,keys%{$hashH->{peerIDsH}};}#peers for a device
elsif ($type =~ m/^Name:(.{6})$/){return map{$hashH->{peerIDsH}{$_}} grep /$1../ ,keys%{$hashH->{peerIDsH}};}#peers for a device elsif ($type =~ m/^Name:(.{6})$/){return map{$hashH->{peerIDsH}{$_}} grep /$1../ ,keys%{$hashH->{peerIDsH}};}#peers for a device
return (); ();
} }
sub CUL_HM_getChnPeers($){ #which peertype am I sub CUL_HM_getChnPeers($){ #which peertype am I
my ($name) = @_; my ($name) = @_;