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

CUL_MAX: send Ack to correct address and don't wait for Ack after Ack

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@2306 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgehre
2012-12-09 15:03:41 +00:00
parent 50889e69b6
commit 7a3d7a70af
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/14_CUL_MAX.pm
View File

@@ -207,7 +207,7 @@ CUL_MAX_Parse($$)
Dispatch($shash, "MAX,$isToMe,$msgType,$src,$payload", {RAWMSG => $rmsg});
#Only ShutterContactState needs ack
if($msgType eq "ShutterContactState" and $dst eq $shash->{addr}) {
CUL_MAX_SendAck($shash,$msgcnt,$dst);
CUL_MAX_SendAck($shash,$msgcnt,$src);
}
} else {
Log 5, "Unhandled message $msgType";
@@ -222,7 +222,7 @@ sub
CUL_MAX_SendAck($$$)
{
my ($hash,$msgcnt,$dst) = @_;
return CUL_MAX_Send($hash, "Ack", $dst, "00", "", "00", $msgcnt);
return CUL_MAX_Send($hash, "Ack", $dst, "00", "00", "00", $msgcnt);
}
#All inputs are hex strings, $cmd is one from %msgCmd2Id
@@ -251,6 +251,7 @@ CUL_MAX_Send(@)
IOWrite($hash, "", "Zs". $packet);
#Schedule checking for Ack
return undef if($cmd eq "Ack"); #we don't get an Ack for an Ack
my $timeout = gettimeofday()+$ackTimeout;
$waitForAck[@waitForAck] = { "packet" => $packet,
"dest" => $dst,