From b1cd5791cbb3b57aac0006452b44bfb325534c20 Mon Sep 17 00:00:00 2001 From: martinp876 Date: Sun, 21 Jul 2013 06:32:11 +0000 Subject: [PATCH] correct trigger git-svn-id: https://svn.fhem.de/fhem/trunk@3462 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 3d26766de..b0f2ea5be 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -1572,12 +1572,10 @@ sub CUL_HM_parseCommon(@){##################################################### } } } -# elsif($mTp eq "40"){ #someone is triggered################ -# CUL_HM_qStateUpdatIfEnab($dst)if (hex($mFlg) & 0x20 && $dhash); -# } elsif($mTp =~ m /^4[01]/){ #someone is triggered########## CUL_HM_qStateUpdatIfEnab($dst)if (hex($mFlg) & 0x20 && $dhash); - my $cName = CUL_HM_id2Name($src.sprintf("%02X",hex(substr($p,0,2))& 0x3f)); + my $cName = CUL_HM_id2Hash($src.sprintf("%02X",hex(substr($p,0,2))& 0x3f)); + $cName = $cName->{NAME}; my $level = "-"; $level = hex(substr($p,4,2))." %" if (length($p)>5); my @peers = split(",",AttrVal($cName,"peerIDs","")); @@ -1585,7 +1583,7 @@ sub CUL_HM_parseCommon(@){##################################################### foreach my $peer (@peers){ my $pName = CUL_HM_id2Name($peer); $pName = CUL_HM_id2Name(substr($peer,0,6)) if (!$defs{$pName}); - next if (!$defs{$pName}); + next if (!$defs{$pName});#||substr($peer,0,6) ne $dst push @entities,CUL_HM_UpdtReadBulk($defs{$pName},1 ,"trig_$cName:$level" ,"trigLast:$cName".(($level ne "-")?":$level":""));