From 6fc00c84d214b93477e7702c5990cf6a1fc1cfd7 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Sun, 19 Nov 2017 18:18:18 +0000 Subject: [PATCH] 10_CUL_HM:template display bug and correction of RT<>TC Team git-svn-id: https://svn.fhem.de/fhem/trunk@15457 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index ac3c67e5b..872efa440 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -4730,8 +4730,8 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++ else{ $hash->{helper}{dlvl} = $plvl; } - if ($md eq "HM-LC-Ja1PBU-FM"){ $hash->{helper}{dlvlCmd} = "++$flag"."11$id$dst"."80$chn$plvl"."CA";} - else{ $hash->{helper}{dlvlCmd} = "++$flag"."11$id$dst"."02$chn$plvl$rval$tval";} + if ($md eq "HM-LC-Ja1PBU-FM"){ $hash->{helper}{dlvlCmd} = "++$flag"."11$id$dst"."80$chn$plvl"."CA";} + else{ $hash->{helper}{dlvlCmd} = "++$flag"."11$id$dst"."02$chn$plvl$rval$tval";} CUL_HM_PushCmdStack($hash,$hash->{helper}{dlvlCmd}); $state = "set_".$lvl; CUL_HM_UpdtReadSingle($hash,"level",$state,1); @@ -5341,11 +5341,15 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++ ,CUL_HM_name2Id($name) # myself ); foreach my $tId (@teamList){ - my $teamC = CUL_HM_id2Name($tId); $tId = substr($tId,0,6); my $teamD = CUL_HM_id2Name($tId); + my $teamCh = ("HM-CC-RT-DN" eq AttrVal($teamD,"model","")) ? "04" #what is the controls channel of the peer? + : "02"; + my $teamC = CUL_HM_id2Name($tId.$teamCh); + next if (!defined $defs{$teamC} ); - CUL_HM_PushCmdStack($defs{$teamD},'++'.$flag."11$id$tId"."8604$temp"); + + CUL_HM_PushCmdStack($defs{$teamD},'++'.$flag."11$id$tId"."86$teamCh$temp"); CUL_HM_UpdtReadSingle($defs{$teamC},"state",$state,1); if ( $tId ne $dst && CUL_HM_getRxType($defs{$teamD}) & "02"){ @@ -7828,10 +7832,9 @@ sub CUL_HM_chgExpLvl($){# update visibility and set internal values for expert sub CUL_HM_setTmplDisp($){ # remove register if outdated my $tHash = shift; delete $tHash->{READINGS}{$_} foreach (grep /^tmpl_/ ,keys %{$tHash->{READINGS}}); - if ($tHash->{helper}{expert}{tpl} && defined $HMConfig::culHmTpl){ + if ($tHash->{helper}{expert}{tpl} && defined %HMConfig::culHmTpl){ foreach (keys %{$tHash->{helper}{tmpl}}){ my ($p,$t) = split(">",$_); - my @param; if($tHash->{helper}{tmpl}{$_}){ @param = split(" ",$HMConfig::culHmTpl{$t}{p});