FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

HM_Config: dd Sw1_CT-Rx

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9071 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2015-08-15 11:43:51 +00:00
parent 80330dda0e
commit 39247a52f7
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/FHEM/10_CUL_HM.pm
View File

@ -1035,8 +1035,6 @@ sub CUL_HM_Parse($$) {#########################################################
# $shash will be replaced for multichannel commands # $shash will be replaced for multichannel commands
$mh{devH} = CUL_HM_id2Hash($mh{src}); #sourcehash - will be modified to channel entity $mh{devH} = CUL_HM_id2Hash($mh{src}); #sourcehash - will be modified to channel entity
$mh{devN} = $mh{devH}->{NAME}; #sourcehash - will be modified to channel entity
$mh{shash} = $mh{devH}; # source device hash
$mh{dstH} = CUL_HM_id2Hash($mh{dst}); # destination device hash $mh{dstH} = CUL_HM_id2Hash($mh{dst}); # destination device hash
$mh{id} = CUL_HM_h2IoId($iohash); $mh{id} = CUL_HM_h2IoId($iohash);
$mh{ioName} = $iohash->{NAME}; $mh{ioName} = $iohash->{NAME};
@ -1051,7 +1049,6 @@ sub CUL_HM_Parse($$) {#########################################################
Log3 undef, 2, "CUL_HM Unknown device $sname is now defined"; Log3 undef, 2, "CUL_HM Unknown device $sname is now defined";
DoTrigger("global","UNDEFINED $sname CUL_HM $mh{src}"); DoTrigger("global","UNDEFINED $sname CUL_HM $mh{src}");
$mh{devH} = CUL_HM_id2Hash($mh{src}); #sourcehash - changed to channel entity $mh{devH} = CUL_HM_id2Hash($mh{src}); #sourcehash - changed to channel entity
$mh{shash} = $mh{devH};
$mh{devH}->{IODev} = $iohash; $mh{devH}->{IODev} = $iohash;
$mh{devH}->{helper}{io}{nextSend} = gettimeofday()+0.09;# io couldn't set $mh{devH}->{helper}{io}{nextSend} = gettimeofday()+0.09;# io couldn't set
} }
@ -1103,7 +1100,8 @@ sub CUL_HM_Parse($$) {#########################################################
return; return;
} }
$respRemoved = 0; #set to 'no response in this message' at start $respRemoved = 0; #set to 'no response in this message' at start
my $name = $mh{devH}->{NAME}; $mh{devN} = $mh{devH}->{NAME}; #sourcehash - will be modified to channel entity
$mh{shash} = $mh{devH}; # source device hash
my $ioId = CUL_HM_h2IoId($mh{devH}->{IODev}); my $ioId = CUL_HM_h2IoId($mh{devH}->{IODev});
$ioId = $mh{id} if(!$ioId); $ioId = $mh{id} if(!$ioId);
if (CUL_HM_getAttrInt($mh{devN},"ignore")){ if (CUL_HM_getAttrInt($mh{devN},"ignore")){
@ -2036,12 +2034,9 @@ sub CUL_HM_Parse($$) {#########################################################
my $type = ($mh{chnraw} & 0x40)?"l":"s"; my $type = ($mh{chnraw} & 0x40)?"l":"s";
my $state = ($mh{chnraw} & 0x40)?"Long":"Short"; my $state = ($mh{chnraw} & 0x40)?"Long":"Short";
my $chId = $mh{src}.$mh{chnHx}; my $chId = $mh{src}.$mh{chnHx};
$mh{shash} = $modules{CUL_HM}{defptr}{$chId}
if($modules{CUL_HM}{defptr}{$chId});
$name = $mh{shash}->{NAME};
my $btnName = $mh{shash}->{helper}{role}{chn} my $btnName = $mh{cHash}->{helper}{role}{chn}
? $name ? $mh{cName}
: "Btn$mh{chn}"; : "Btn$mh{chn}";
if($type eq "l"){# long press if($type eq "l"){# long press
@ -2061,16 +2056,16 @@ sub CUL_HM_Parse($$) {#########################################################
delete $mh{devH}->{lastMsg}; delete $mh{devH}->{lastMsg};
} }
CUL_HM_calcDisWm($mh{shash},$mh{devH}->{NAME},$type); CUL_HM_calcDisWm($mh{cHash},$mh{devN},$type);
if (AttrVal($btnName,"aesCommReq",0)){ if (AttrVal($btnName,"aesCommReq",0)){
my @arr = (); my @arr = ();
$mh{devH}->{cmdStacAESPend} = \@arr; $mh{devH}->{cmdStacAESPend} = \@arr;
push (@{$mh{devH}->{cmdStacAESPend} },"$mh{src};++A011$mh{id}$mh{src}$_") push (@{$mh{devH}->{cmdStacAESPend} },"$mh{src};++A011$mh{id}$mh{src}$_")
foreach (@{$mh{shash}->{helper}{disp}{$type}}); foreach (@{$mh{cHash}->{helper}{disp}{$type}});
} }
else{ else{
CUL_HM_PushCmdStack($mh{devH},"++A011$mh{id}$mh{src}$_") CUL_HM_PushCmdStack($mh{devH},"++A011$mh{id}$mh{src}$_")
foreach (@{$mh{shash}->{helper}{disp}{$type}}); foreach (@{$mh{cHash}->{helper}{disp}{$type}});
} }
} }
} }