From 7e17b47d493b73b600c95197b4fc3fd86f046032 Mon Sep 17 00:00:00 2001
From: martinp876 <martinp876@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Fri, 12 Jun 2020 08:28:36 +0000
Subject: [PATCH] CUL_HM: update template support for commandlist - bug with
 internal peers

git-svn-id: https://svn.fhem.de/fhem/trunk@22169 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/10_CUL_HM.pm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm
index c582d3be1..8a7263e9d 100755
--- a/fhem/FHEM/10_CUL_HM.pm
+++ b/fhem/FHEM/10_CUL_HM.pm
@@ -8354,11 +8354,15 @@ sub CUL_HM_getRegFromStore($$$$@) {#read a register from backup data
 sub CUL_HMTmplSetCmd($){
   my $name = shift;
   return "" if(not scalar devspec2array("TYPE=HMinfo"));
+  my $devId = substr($defs{$name}{DEF},0,6);
   my %a;
-  my @peerIds = map{CUL_HM_id2Name($_)} grep !/00000000/,split(",",AttrVal($name,"peerIDs",""));
-  foreach my $peer($peerIds[0],"0"){ 
+
+  my   @peers = map{CUL_HM_id2Name($_)}   grep !/^(00000000|$devId)/,split(",",AttrVal($name,"peerIDs",""));
+  push @peers,  map{"self".substr($_,-2)} grep /^$devId/            ,split(",",AttrVal($name,"peerIDs",""));
+  foreach my $peer($peers[0],"0"){ 
     next if (!defined $peer);
     $peer = "self".substr($peer,-2) if($peer =~ m/^${name}_chn-..$/);
+    $peer = "self".substr($peer,-2) if($peer =~ m/^${name}_chn-..$/);
     my $ps = $peer eq "0" ? "R-" : "R-$peer-";
     my %b = map { $_ => 1 }map {(my $foo = $_) =~ s/.?$ps//; $foo;} grep/.?$ps/,keys%{$defs{$name}{READINGS}};
     foreach my $t(keys %HMConfig::culHmTpl){
@@ -8371,8 +8375,7 @@ sub CUL_HMTmplSetCmd($){
       }
       if($f == 0){
         if($typShLg){
-          foreach my $pAss (@peerIds){
-            $pAss = "self".substr($pAss,-2) if($pAss =~ m/^${name}_chn-..$/);
+          foreach my $pAss (@peers){
             $a{$pAss}{$t."_short"} = 1;
             $a{$pAss}{$t."_long"} = 1;
           }
@@ -8382,7 +8385,7 @@ sub CUL_HMTmplSetCmd($){
             $a{$peer}{$t} = 1;
           }
           else{
-            $a{$_}{$t} = 1  foreach(map{$_ =~ m/^${name}_chn-..$/ ? "self".substr($peer,-2) : $_}@peerIds);
+            $a{$_}{$t} = 1  foreach(map{$_ =~ m/^${name}_chn-..$/ ? "self".substr($peer,-2) : $_}@peers);
           }
         }
       }