FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 19:36:02 +00:00
Code Issues Releases Wiki Activity

10_cul_hm: correct aes trigger

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8221 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2015-03-15 18:17:36 +00:00
parent d79a0fa748
commit 8949f3777e
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/10_CUL_HM.pm
View File

@ -1037,6 +1037,7 @@ sub CUL_HM_Parse($$) {#########################################################
if($mTp =~ m /^4[01]/){ #someone is triggered########## if($mTp =~ m /^4[01]/){ #someone is triggered##########
my $chn = hex($mI[0])& 0x3f; my $chn = hex($mI[0])& 0x3f;
my $cName = CUL_HM_id2Name($src.sprintf("%02X",$chn)); my $cName = CUL_HM_id2Name($src.sprintf("%02X",$chn));
push @evtEt,[$defs{$cName},1,"trig_aes_$dname:$aesStat:$mNo"];
my @peers = grep !/00000000/,split(",",AttrVal($cName,"peerIDs","")); my @peers = grep !/00000000/,split(",",AttrVal($cName,"peerIDs",""));
foreach my $peer (grep /$dst/,@peers){ foreach my $peer (grep /$dst/,@peers){
@ -1046,7 +1047,6 @@ sub CUL_HM_Parse($$) {#########################################################
push @evtEt,[$defs{$pName},1,"trig_aes_$cName:$aesStat:$mNo"]; push @evtEt,[$defs{$pName},1,"trig_aes_$cName:$aesStat:$mNo"];
} }
} }
CUL_HM_pushEvnts();
$defs{$_}{".noDispatchVars"} = 1 foreach (grep !/^$devH->{NAME}$/,@entities); $defs{$_}{".noDispatchVars"} = 1 foreach (grep !/^$devH->{NAME}$/,@entities);
return (CUL_HM_pushEvnts(),$name); return (CUL_HM_pushEvnts(),$name);
} }
@ -1986,7 +1986,6 @@ sub CUL_HM_Parse($$) {#########################################################
push @evtEt,[$shash,1,"deviceMsg:$vs$target"] if($chn ne "00"); push @evtEt,[$shash,1,"deviceMsg:$vs$target"] if($chn ne "00");
push @evtEt,[$shash,1,"state:$vs"]; push @evtEt,[$shash,1,"state:$vs"];
push @evtEt,[$shash,1,"timedOn:".(($err&0x40)?"running":"off")]; push @evtEt,[$shash,1,"timedOn:".(($err&0x40)?"running":"off")];
push @evtEt,[$devH ,1,"battery:".(($err&0x80)?"low" :"ok" )];
} }
elsif ($mTp eq "5E" ||$mTp eq "5F" ) { # POWER_EVENT_CYCLIC elsif ($mTp eq "5E" ||$mTp eq "5F" ) { # POWER_EVENT_CYCLIC
$shash = $modules{CUL_HM}{defptr}{$src."02"} $shash = $modules{CUL_HM}{defptr}{$src."02"}
@ -7039,7 +7038,7 @@ sub CUL_HM_UpdtReadBulk(@) { #update a bunch of readings and trigger the events
} }
else{ else{
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
foreach my $rd (@readings){ foreach my $rd (CUL_HM_noDup(@readings)){
next if (!$rd); next if (!$rd);
my ($rdName, $rdVal) = split(":",$rd, 2); my ($rdName, $rdVal) = split(":",$rd, 2);
readingsBulkUpdate($hash,$rdName, readingsBulkUpdate($hash,$rdName,

22
fhem/FHEM/HMConfig.pm
View File

@ -466,17 +466,17 @@ my $K_actDetID = '000000'; # id of actionDetector
RS485IdleTime =>{a=> 29.0,s=>1.0,l=>0,min=>0 ,max=>255 ,c=>'' ,f=>'' ,u=>'s' ,d=>0,t=>"Idle Time"}, RS485IdleTime =>{a=> 29.0,s=>1.0,l=>0,min=>0 ,max=>255 ,c=>'' ,f=>'' ,u=>'s' ,d=>0,t=>"Idle Time"},
#un-identified List0 #un-identified List0
# addr Dec!! # addr Dec!!
# SEC-WM55 02:01 (AES on?) # SEC-WM55 02:01 (AES on?)
# CC-RT 02:01 16:00 # CC-RT 02:01 16:00
# TC-IT 02:01 16:00 # TC-IT 02:01 16:00
# SEC-WDS 02:01 16:01(sabotage) ? # SEC-WDS 02:01 16:01(sabotage) ?
# 4DIS 02:01 ? # 4DIS 02:01
# HM-SEC-MDIR 02:01 ? # HM-SEC-MDIR 02:01
# SEC-SC 02:00 ? # SEC-SC 02:00
# Blind 9:00 10:00 20:00 # Blind 9:00 10:00 20:00
# BL1TPBU 02:01 21:FF # BL1TPBU 02:01 21:FF
# Dim1TPBU 02:01 21:FF 22:00 # Dim1TPBU 02:01 21:FF 22:00
# HM-MOD-Re-8 30:49 # HM-MOD-Re-8 30:49
# tx: D1E8 9158 # tx: D1E8 9158
#Keymatic 3.3 unknown, seen 1 here #Keymatic 3.3 unknown, seen 1 here