From 31a1a27db86761dc849c490f6a303447afa0437d Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Sat, 23 Nov 2013 16:56:20 +0000 Subject: [PATCH] repair SD peering virtual git-svn-id: https://svn.fhem.de/fhem/trunk@4276 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 8 +++++--- fhem/FHEM/HMConfig.pm | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index a09d0d58e..4386d396b 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -3163,7 +3163,8 @@ sub CUL_HM_Set($@) { $culHmRegType{$st}{peerNeedsBurst}); for(my $i = 1; $i <= $nrCh2Pair; $i++) { my $b = ($i==1 ? $b1 : $b2); - if ($st eq "virtual"){ + $b = $b2 if ($pSt eq "smokeDetector"); + if ($st eq "virtual"){ my $btnName = CUL_HM_id2Name($dst.sprintf("%02X",$b)); return "button ".$b." not defined for virtual remote ".$name if (!defined $attr{$btnName}); @@ -3171,9 +3172,10 @@ sub CUL_HM_Set($@) { } else{ my $bStr = sprintf("%02X",$b); - CUL_HM_PushCmdStack($hash, + CUL_HM_PushCmdStack($hash, "++".$flag."01${id}${dst}${bStr}$cmdB${peerDst}${peerBtn}00"); - CUL_HM_pushConfig($hash,$id, $dst,$b,$peerDst,hex($peerBtn),4,$burst) + CUL_HM_pushConfig($hash,$id, $dst,$b,$peerDst, + hex($peerBtn),4,$burst) if($pnb && $cmdB eq "01"); # only if set CUL_HM_qAutoRead($name,3); } diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index bbc21e1bb..db30593b4 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -397,6 +397,7 @@ my %culHmRegDefine = ( # SEC-WM55 02:01 (AES on?) # CC-RT 02:01 16:00 # SEC-WDS 02:01 16:01(sabotage) ? +# 4DIS 02:01 ? # HM-SEC-MDIR 02:01 ? # SEC-SC 02:00 ? # Blind 9:00 10:00 20:00