From b95f7e02537f474486d44c9363d2cf0dedf7e81f Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Mon, 16 Dec 2013 12:51:52 +0000 Subject: [PATCH] sd teamLead for phys device repair, autoburst for peering git-svn-id: https://svn.fhem.de/fhem/trunk@4391 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 15 +++++++++------ fhem/FHEM/HMConfig.pm | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index c6c4c9f56..c3ce4baa5 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -5,8 +5,6 @@ package main; -# attribut conversion "#todo Updt4 remove" -# the lines can be removed after some soak time - around version 2600 use strict; use warnings; use HMConfig; @@ -3286,9 +3284,13 @@ sub CUL_HM_Set($@) { # First the remote (one loop for on, one for off) if (!$target || $target =~ m/^(remote|both)$/){ - my $burst = ($pSt eq "thermostat"?"0101":"0100");#set burst for target - my $pnb = 1 if ($culHmRegModel{$md}{peerNeedsBurst}|| #supported? - $culHmRegType{$st}{peerNeedsBurst}); + my $burst; + if ($culHmRegModel{$md}{peerNeedsBurst}|| #peerNeedsBurst supported + $culHmRegType{$st}{peerNeedsBurst}){ + $burst = (CUL_HM_getRxType($peerHash) & 0x82) #burst |burstConditional + ?"0101" + :"0100"; + } for(my $i = 1; $i <= $nrCh2Pair; $i++) { my $b = ($i==1 ? $b1 : $b2); $b = $b2 if ($pSt eq "smokeDetector"); @@ -3304,7 +3306,7 @@ sub CUL_HM_Set($@) { "++".$flag."01${id}${dst}${bStr}$cmdB${peerDst}${peerBtn}00"); CUL_HM_pushConfig($hash,$id, $dst,$b,$peerDst, hex($peerBtn),4,$burst) - if($pnb && $cmdB eq "01"); # only if set + if($burst && $cmdB eq "01"); # only if set CUL_HM_qAutoRead($name,3); } } @@ -4107,6 +4109,7 @@ sub CUL_HM_ID2PeerList ($$$) { my $tn = ($_ =~ m/self/)?$name:$_; next if (!$defs{$tn}); $defs{$tn}{sdTeam} = "sdLead" ; + $defs{$tn}{helper}{fkt}="sdLead"; } if($peerNames !~ m/self/){ delete $hash->{sdTeam}; diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index a681a2385..891a1d8a7 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -1,6 +1,6 @@ ############################################## # CUL HomeMatic device configuration data -# $Id: HMConfig.pm 4170 2013-11-07 14:13:43Z martinp876 $ +# $Id: $ ##################################################### # configuration data for CUL_HM -used to split code and configuration