FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 23:06:37 +00:00
Code Issues Releases Wiki Activity

ignor HMLAN internal messages

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6096 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-06-10 05:07:02 +00:00
parent e5f114244c
commit 0d67ae13b2
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fhem/FHEM/10_CUL_HM.pm
View File

@ -868,9 +868,7 @@ sub CUL_HM_Parse($$) {#########################################################
# return "" if($src eq $id);# mirrored messages - covered by !$shash # return "" if($src eq $id);# mirrored messages - covered by !$shash
if(!$shash){ # Unknown source if(!$shash){ # Unknown source
# CUL_HM_pushEvnts(); return "" if ($msg =~ m/998112......000001/);# HMLAN internal message, consum
# $defs{$_}{".noDispatchVars"} = 1 foreach (@entities);
# return (CUL_HM_pushEvnts(),@entities);
return; return;
} }
$respRemoved = 0; #set to 'no response in this message' at start $respRemoved = 0; #set to 'no response in this message' at start
@ -903,7 +901,7 @@ sub CUL_HM_Parse($$) {#########################################################
my $pName = CUL_HM_id2Name($peer); my $pName = CUL_HM_id2Name($peer);
$pName = CUL_HM_id2Name(substr($peer,0,6)) if (!$defs{$pName}); $pName = CUL_HM_id2Name(substr($peer,0,6)) if (!$defs{$pName});
next if (!$defs{$pName});#||substr($peer,0,6) ne $dst next if (!$defs{$pName});#||substr($peer,0,6) ne $dst
push @evtEt,[$defs{$pName},1,"trig_aes1_$cName:$aesStat:$mNo"]; push @evtEt,[$defs{$pName},1,"trig_aes_$cName:$aesStat:$mNo"];
} }
} }
CUL_HM_pushEvnts(); CUL_HM_pushEvnts();
@ -2833,7 +2831,7 @@ sub CUL_HM_Get($@) {#+++++++++++++++++ get command+++++++++++++++++++++++++++++
else { @fnd = grep /:$a[2]$/,@fnd;} else { @fnd = grep /:$a[2]$/,@fnd;}
$_ =~ s/status_(.*):.*/$1/ foreach(@fnd); $_ =~ s/status_(.*):.*/$1/ foreach(@fnd);
push @fnd,"empty" if (!scalar(@fnd)); push @fnd,"empty" if (!scalar(@fnd));
return join",",@fnd; return join",",sort(@fnd);
} else{ } else{
return "please enter parameter [alive|unknown|dead|notAlive]"; return "please enter parameter [alive|unknown|dead|notAlive]";
} }
@ -4321,32 +4319,16 @@ sub CUL_HM_valvePosUpdt(@) {#update valve position periodically to please valve
} }
elsif( ($vc ne "init" && $hashVd->{msgRed} <= $hashVd->{miss}) elsif( ($vc ne "init" && $hashVd->{msgRed} <= $hashVd->{miss})
|| $hash->{helper}{virtTC} ne "00") { || $hash->{helper}{virtTC} ne "00") {
$hashVd->{msgSent} = 1; $hashVd->{msgSent} = 1;
# CUL_HM_SndCmd($defs{$hashVd->{nDev}},sprintf("%02X%s%s%s" CUL_HM_SndCmd($defs{$hashVd->{nDev}},sprintf("%02X%s%s%s"
# ,$msgCnt
# ,"A112221133150B94"
# ,""
# ,""));
# if ($defs{$hashVd->{nDev}}->{cmdStack}){
# my $mcA = sprintf("%02X",$msgCnt);
# CUL_HM_PushCmdStack($defs{$hashVd->{nDev}},sprintf("%02X%s%s%s"
# ,$msgCnt
# ,$hashVd->{cmd}
# ,$hash->{helper}{virtTC}
# ,$hashVd->{val}));
#
# CUL_HM_SndCmd($defs{$hashVd->{nDev}}, $mcA.'A1121743BF150B94');
# CUL_HM_ProcessCmdStack($defs{$hashVd->{nDev}});
# }
# else{
CUL_HM_SndCmd($defs{$hashVd->{nDev}},sprintf("%02X%s%s%s"
,$msgCnt ,$msgCnt
,$hashVd->{cmd} ,$hashVd->{cmd}
,$hash->{helper}{virtTC} ,$hash->{helper}{virtTC}
,$hashVd->{val})); ,$hashVd->{val}));
# }
} }
InternalTimer($tn+10,"CUL_HM_valvePosTmr","valveTmr:$vId",0); InternalTimer($tn+10,"CUL_HM_valvePosTmr","valveTmr:$vId",0);
$hashVd->{virtTC} = $hash->{helper}{virtTC};#save for repeat
$hash->{helper}{virtTC} = "00";
} }
elsif ($hashVd->{typ} == 2){#send to broadcast elsif ($hashVd->{typ} == 2){#send to broadcast
CUL_HM_PushCmdStack($hash,sprintf("%02X%s%s" CUL_HM_PushCmdStack($hash,sprintf("%02X%s%s"
@ -4362,7 +4344,6 @@ sub CUL_HM_valvePosUpdt(@) {#update valve position periodically to please valve
CUL_HM_UpdtReadSingle($hash,"state","stopped",1); CUL_HM_UpdtReadSingle($hash,"state","stopped",1);
return;# terminate processing return;# terminate processing
} }
$hash->{helper}{virtTC} = "00";
CUL_HM_ProcessCmdStack($hash); CUL_HM_ProcessCmdStack($hash);
} }
sub CUL_HM_valvePosTmr(@) {#calc next vd wakeup sub CUL_HM_valvePosTmr(@) {#calc next vd wakeup
@ -4391,6 +4372,7 @@ sub CUL_HM_valvePosTmr(@) {#calc next vd wakeup
$hashVd->{ackT} = $ackTime; $hashVd->{ackT} = $ackTime;
} }
else { else {
$hash->{helper}{virtTC} = $hashVd->{virtTC} if($hash->{helper}{virtTC} eq "00" && $hashVd->{virtTC});
$hashVd->{miss}++; $hashVd->{miss}++;
} }
CUL_HM_UpdtReadSingle($hash,"valveCtrl",$vcn,1) if($vc ne $vcn); CUL_HM_UpdtReadSingle($hash,"valveCtrl",$vcn,1) if($vc ne $vcn);