Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

sd teamLead for phys device repair, autoburst for peering

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4391 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-12-16 12:51:52 +00:00
parent b25100618a
commit b95f7e0253
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/10_CUL_HM.pm
View File

@ -5,8 +5,6 @@
package main; package main;
# attribut conversion "#todo Updt4 remove"
# the lines can be removed after some soak time - around version 2600
use strict; use strict;
use warnings; use warnings;
use HMConfig; use HMConfig;
@ -3286,9 +3284,13 @@ sub CUL_HM_Set($@) {
# First the remote (one loop for on, one for off) # First the remote (one loop for on, one for off)
if (!$target || $target =~ m/^(remote|both)$/){ if (!$target || $target =~ m/^(remote|both)$/){
my $burst = ($pSt eq "thermostat"?"0101":"0100");#set burst for target my $burst;
my $pnb = 1 if ($culHmRegModel{$md}{peerNeedsBurst}|| #supported? if ($culHmRegModel{$md}{peerNeedsBurst}|| #peerNeedsBurst supported
$culHmRegType{$st}{peerNeedsBurst}); $culHmRegType{$st}{peerNeedsBurst}){
$burst = (CUL_HM_getRxType($peerHash) & 0x82) #burst |burstConditional
?"0101"
:"0100";
}
for(my $i = 1; $i <= $nrCh2Pair; $i++) { for(my $i = 1; $i <= $nrCh2Pair; $i++) {
my $b = ($i==1 ? $b1 : $b2); my $b = ($i==1 ? $b1 : $b2);
$b = $b2 if ($pSt eq "smokeDetector"); $b = $b2 if ($pSt eq "smokeDetector");
@ -3304,7 +3306,7 @@ sub CUL_HM_Set($@) {
"++".$flag."01${id}${dst}${bStr}$cmdB${peerDst}${peerBtn}00"); "++".$flag."01${id}${dst}${bStr}$cmdB${peerDst}${peerBtn}00");
CUL_HM_pushConfig($hash,$id, $dst,$b,$peerDst, CUL_HM_pushConfig($hash,$id, $dst,$b,$peerDst,
hex($peerBtn),4,$burst) 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); CUL_HM_qAutoRead($name,3);
} }
} }
@ -4107,6 +4109,7 @@ sub CUL_HM_ID2PeerList ($$$) {
my $tn = ($_ =~ m/self/)?$name:$_; my $tn = ($_ =~ m/self/)?$name:$_;
next if (!$defs{$tn}); next if (!$defs{$tn});
$defs{$tn}{sdTeam} = "sdLead" ; $defs{$tn}{sdTeam} = "sdLead" ;
$defs{$tn}{helper}{fkt}="sdLead";
} }
if($peerNames !~ m/self/){ if($peerNames !~ m/self/){
delete $hash->{sdTeam}; delete $hash->{sdTeam};

2
fhem/FHEM/HMConfig.pm
View File

@ -1,6 +1,6 @@
############################################## ##############################################
# CUL HomeMatic device configuration data # 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 # configuration data for CUL_HM -used to split code and configuration