mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10_CUL_HM: button state

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@8482 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876
2015-04-26 08:31:40 +00:00
parent 411d8d93b3
commit 03600fbcb0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/10_CUL_HM.pm
View File

@@ -1820,8 +1820,11 @@ sub CUL_HM_Parse($$) {#########################################################
if($mTp eq "40") { if($mTp eq "40") {
my ($chn) = map{hex($_)} ($mI[0]);# button/event count my ($chn) = map{hex($_)} ($mI[0]);# button/event count
my $btnName; my $btnName;
my $bat = ($chn&0x80)?"low":"ok";
my $type = ($chn & 0x40)?"l":"s";
my $state = ($chn & 0x40)?"Long":"Short"; my $state = ($chn & 0x40)?"Long":"Short";
my $chnHash = $modules{CUL_HM}{defptr}{$src.sprintf("%02X",$chn&0x3f)}; $chn = $chn & 0x3f;
my $chnHash = $modules{CUL_HM}{defptr}{$src.sprintf("%02X",$chn)};
if ($chnHash){# use userdefined name - ignore irritating on-off naming if ($chnHash){# use userdefined name - ignore irritating on-off naming
$btnName = $chnHash->{NAME}; $btnName = $chnHash->{NAME};
@@ -1830,15 +1833,13 @@ sub CUL_HM_Parse($$) {#########################################################
$chnHash = $shash; $chnHash = $shash;
$btnName = "Btn$chn"; $btnName = "Btn$chn";
} }
if($chn & 0x40){# long press if($type eq "l"){# long press
$state .= ($mFlgH & 0x20 ? "Release" : ""); $state .= ($mFlgH & 0x20 ? "Release" : "");
} }
$shash->{helper}{addVal} = $chn; #store to handle changesFread push @evtEt,[$devH,1,"battery:$bat"];
push @evtEt,[$devH,1,"battery:". (($chn&0x80)?"low":"ok")];
push @evtEt,[$devH,1,"state:$btnName $state"]; push @evtEt,[$devH,1,"state:$btnName $state"];
if($md eq "HM-Dis-WM55"){ if($md eq "HM-Dis-WM55"){
my $type = ($chn & 0x40)?"l":"s";
if ($devH->{cmdStack}){# there are pending commands. we only send new ones if ($devH->{cmdStack}){# there are pending commands. we only send new ones
delete $devH->{cmdStack}; delete $devH->{cmdStack};
delete $devH->{cmdStacAESPend}; delete $devH->{cmdStacAESPend};