FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 11:26:55 +00:00
Code Issues Releases Wiki Activity

check sequenz number for mulit-message answer

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4169 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-11-07 07:34:45 +00:00
parent 6ddba6b809
commit b9e064fd36
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/10_CUL_HM.pm
View File

@ -1693,7 +1693,15 @@ sub CUL_HM_parseCommon(@){#####################################################
$ret = "done"; $ret = "done";
} }
elsif($subType eq "01"){ #storePeerList================================= elsif($subType eq "01"){ #storePeerList=================================
my $msgValid = 0;
if ($pendType eq "PeerList"){ if ($pendType eq "PeerList"){
if($shash->{helper}{prt}{rspWait}{mNo} == hex($mNo)){#next message
$shash->{helper}{prt}{rspWait}{mNo}++;
$shash->{helper}{prt}{rspWait}{mNo} &= 0xff;
$msgValid = 1;
}
}
if ($msgValid){
my $chn = $shash->{helper}{prt}{rspWait}{forChn}; my $chn = $shash->{helper}{prt}{rspWait}{forChn};
my $chnhash = $modules{CUL_HM}{defptr}{$src.$chn}; my $chnhash = $modules{CUL_HM}{defptr}{$src.$chn};
$chnhash = $shash if (!$chnhash); $chnhash = $shash if (!$chnhash);
@ -1730,9 +1738,20 @@ sub CUL_HM_parseCommon(@){#####################################################
} }
$ret = "done"; $ret = "done";
} }
else{#response without request - discard
$ret = "done";
}
} }
elsif($subType eq "02" ||$subType eq "03"){ #ParamResp================== elsif($subType eq "02" ||$subType eq "03"){ #ParamResp==================
my $msgValid = 0;
if ($pendType eq "RegisterRead"){ if ($pendType eq "RegisterRead"){
if($shash->{helper}{prt}{rspWait}{mNo} == hex($mNo)){#next message
$shash->{helper}{prt}{rspWait}{mNo}++;
$shash->{helper}{prt}{rspWait}{mNo} &= 0xff;
$msgValid = 1;
}
}
if ($msgValid){
my $chnSrc = $src.$shash->{helper}{prt}{rspWait}{forChn}; my $chnSrc = $src.$shash->{helper}{prt}{rspWait}{forChn};
my $chnHash = $modules{CUL_HM}{defptr}{$chnSrc}; my $chnHash = $modules{CUL_HM}{defptr}{$chnSrc};
$chnHash = $shash if (!$chnHash); $chnHash = $shash if (!$chnHash);
@ -3471,6 +3490,7 @@ sub CUL_HM_responseSetup($$) {#store all we need to handle the response
#--- remember request params in device level #--- remember request params in device level
CUL_HM_respWaitSu ($hash,"Pending:=PeerList" CUL_HM_respWaitSu ($hash,"Pending:=PeerList"
,"cmd:=$cmd" ,"forChn:=".substr($p,0,2) ,"cmd:=$cmd" ,"forChn:=".substr($p,0,2)
,"mNo:=".hex($mNo)
,"reSent:=1"); ,"reSent:=1");
#--- remove readings in channel #--- remove readings in channel
@ -3488,6 +3508,7 @@ sub CUL_HM_responseSetup($$) {#store all we need to handle the response
CUL_HM_respWaitSu ($hash,"Pending:=RegisterRead" CUL_HM_respWaitSu ($hash,"Pending:=RegisterRead"
,"cmd:=$cmd" ,"forChn:=$chn" ,"cmd:=$cmd" ,"forChn:=$chn"
,"forList:=$list","forPeer:=$peer" ,"forList:=$list","forPeer:=$peer"
,"mNo:=".hex($mNo)
,"reSent:=1"); ,"reSent:=1");
#--- remove channel entries that will be replaced #--- remove channel entries that will be replaced
my $chnhash = $modules{CUL_HM}{defptr}{"$dst$chn"}; my $chnhash = $modules{CUL_HM}{defptr}{"$dst$chn"};