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

CUL_HM: add repeater to internals

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11525 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2016-05-26 13:51:08 +00:00
parent bc257183b3
commit ba5801e101
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/10_CUL_HM.pm
View File

@ -6733,7 +6733,7 @@ sub CUL_HM_protState($$){
sub CUL_HM_ID2PeerList ($$$) { sub CUL_HM_ID2PeerList ($$$) {
my($name,$peerID,$set) = @_; my($name,$peerID,$set) = @_;
my $peerIDs = AttrVal($name,"peerIDs",""); my $peerIDs = AttrVal($name,"peerIDs","");
return if (!$peerID && !$peerIDs); return if (!$peerID && !$peerIDs); # nothing to do
my $hash = $defs{$name}; my $hash = $defs{$name};
$peerIDs =~ s/$peerID//g; #avoid duplicate, support unset $peerIDs =~ s/$peerID//g; #avoid duplicate, support unset
$peerID =~ s/^000000../00000000/; #correct end detector $peerID =~ s/^000000../00000000/; #correct end detector
@ -6817,7 +6817,7 @@ sub CUL_HM_ID2PeerList ($$$) {
} }
} }
} }
else{ else{# no peer set - clean up: delete entries
delete $hash->{READINGS}{peerList}; delete $hash->{READINGS}{peerList};
delete $hash->{peerList}; delete $hash->{peerList};
if (($md =~ m/HM-CC-RT-DN/ && $chn=~ m/(02|03|04|05|06)/) if (($md =~ m/HM-CC-RT-DN/ && $chn=~ m/(02|03|04|05|06)/)
@ -7314,7 +7314,6 @@ sub CUL_HM_chgExpLvl($){# update visibility and set internal values for expert
} }
sub CUL_HM_setTmplDisp($){ # remove register i outdated sub CUL_HM_setTmplDisp($){ # remove register i outdated
my $tHash = shift; my $tHash = shift;
#{CUL_HM_setTmplDisp($defs{loDoor})}
delete $tHash->{READINGS}{$_} foreach (grep /^tmpl_/ ,keys %{$tHash->{READINGS}}); delete $tHash->{READINGS}{$_} foreach (grep /^tmpl_/ ,keys %{$tHash->{READINGS}});
if ($tHash->{helper}{expert}{tpl}){ if ($tHash->{helper}{expert}{tpl}){
foreach (keys %{$tHash->{helper}{tmpl}}){ foreach (keys %{$tHash->{helper}{tmpl}}){
@ -7793,7 +7792,9 @@ sub CUL_HM_repReadings($) { # parse repeater
next if (!$pId || $pId eq "00000000"); next if (!$pId || $pId eq "00000000");
$pCnt{$pId.$cnt}{cnt}=$cnt++; $pCnt{$pId.$cnt}{cnt}=$cnt++;
} }
delete $hash->{repeater} foreach(devspec2array("TYPE=CUL_HM"
.":FILTER=DEF=......"
.":FILTER=repeater=$hash->{NAME}"));
my @pS; my @pS;
my @pD; my @pD;
my @pB; my @pB;
@ -7826,7 +7827,10 @@ sub CUL_HM_repReadings($) { # parse repeater
); );
$repAttr[$fNo] = "$sName:" $repAttr[$fNo] = "$sName:"
.((!$pS[$fNo] || $pS[$fNo] ne $sName)?"-":$pD[$fNo]) .((!$pS[$fNo] || $pS[$fNo] ne $sName)?"-":$pD[$fNo])
.":".($pB[$fNo]?$pB[$fNo]:"-"); .":".($pB[$fNo]?$pB[$fNo]:"-");
$defs{$dName}{repeater} = $hash->{NAME} if ($defs{$dName});
push @retL,$eS; push @retL,$eS;
$readList[$fNo]="repPeer_".$eS; $readList[$fNo]="repPeer_".$eS;
} }