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

10_ZWave.pm: check get response class in processSendStack (Forum #50090)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11016 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-03-06 18:35:05 +00:00
parent 7a3b6c2932
commit 1cb48479a5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/10_ZWave.pm
View File

@ -3552,9 +3552,9 @@ ZWave_isWakeUp($)
# next discards either state. # next discards either state.
# acktpye: next, ack or msg # acktpye: next, ack or msg
sub sub
ZWave_processSendStack($$) ZWave_processSendStack($$;$)
{ {
my ($hash,$ackType) = @_; my ($hash,$ackType, $msg) = @_;
my $ss = $hash->{SendStack}; my $ss = $hash->{SendStack};
return if(!$ss); return if(!$ss);
@ -3562,7 +3562,13 @@ ZWave_processSendStack($$)
if($1 eq "get" && $ackType eq "ack") { if($1 eq "get" && $ackType eq "ack") {
$ss->[0] = "sentackget:$2"; $ss->[0] = "sentackget:$2";
return; return;
} elsif($1 eq "ackget" && $ackType eq "msg") {# compare answer class for get
my $cs = substr($2, 6, 2);
my $cg = substr($msg, 2, 2);
return if($cs ne $cg);
} }
shift @{$ss}; shift @{$ss};
RemoveInternalTimer($hash) if(!ZWave_isWakeUp($hash)); RemoveInternalTimer($hash) if(!ZWave_isWakeUp($hash));
} }
@ -3903,7 +3909,7 @@ ZWave_Parse($$@)
ZWave_processSendStack($hash, "next"); ZWave_processSendStack($hash, "next");
} else { } else {
ZWave_processSendStack($hash, "msg") ZWave_processSendStack($hash, "msg", $arg)
if(!ZWave_isWakeUp($hash) || $hash->{wakeupAlive}); if(!ZWave_isWakeUp($hash) || $hash->{wakeupAlive});
} }