FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 01:09:47 +00:00
Code Issues Releases Wiki Activity

correct SD peering with virtual master

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4244 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-11-18 09:12:12 +00:00
parent 2d47017330
commit 2b437d1b04
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/10_CUL_HM.pm
View File

@ -3135,7 +3135,8 @@ sub CUL_HM_Set($@) {
return "use - single [set|unset] actor - for smoke detector" if( $st eq "smokeDetector" && (!$single || $single ne "single" || $target ne "actor"));
return "use - single - for ".$st if(($st =~ m/(threeStateSensor|thermostat|motionDetector)/)
&& (!$single || $single ne "single"));
my $pSt = CUL_HM_Get($peerHash,$peerHash->{NAME},"param","subType");
$single = ($single eq "single")?1:"";#default to dual
$set = ($set && $set eq "unset")?0:1;
@ -3143,17 +3144,17 @@ sub CUL_HM_Set($@) {
$b1 = ($roleC) ? hex($myBtn) : ($single?$bNo : ($bNo*2 - 1));
if ($single){
$b2 = $b1;
$b1 = 0 if ($st eq "smokeDetector");
$b1 = 0 if ($st eq "smokeDetector" ||$pSt eq "smokeDetector");
$nrCh2Pair = 1;
}
else{
$b2 = $b1 + 1;
$nrCh2Pair = 2;
}
$target = "both" if ($st eq "virtual" && $pSt eq "smokeDetector");
my $cmdB = ($set)?"01":"02";# do we set or remove?
# First the remote (one loop for on, one for off)
my $pSt = CUL_HM_Get($peerHash,$peerHash->{NAME},"param","subType");
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?