2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00

10_ZWave.pm: better useMultiCmd placing

git-svn-id: https://svn.fhem.de/fhem/trunk@13275 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-01-29 18:28:25 +00:00
parent c82e8082f4
commit 1907fc7bf3

View File

@ -4230,6 +4230,16 @@ ZWave_addToSendStack($$$)
if($cmd =~ m/^......988[01].*/) {
Log3 $hash->{NAME}, 5, "$hash->{NAME}: Sendstack bypassed for $cmd";
} else {
if($hash->{useMultiCmd}) {
ZWave_packSendStack($hash);
if($hash->{INTRIGGER}) { # Allow repacking of multiple gets on WUN
if(!$hash->{delayedProcessing}) {
$hash->{delayedProcessing} = 1;
InternalTimer(1, sub(){ZWave_processSendStack($hash, "next");}, 0);
}
return;
}
}
return "Scheduled for sending after WAKEUP" if(!$hash->{wakeupAlive});
}
@ -4242,16 +4252,6 @@ ZWave_addToSendStack($$$)
return ZWave_addToSendStack($hash, $type, $cmd);
}
}
if($hash->{useMultiCmd}) {
ZWave_packSendStack($hash);
if($hash->{INTRIGGER}) { # Allow repacking of multiple gets on WUN
if(!$hash->{delayedProcessing}) {
$hash->{delayedProcessing} = 1;
InternalTimer(1, sub(){ZWave_processSendStack($hash, "next");}, 0);
}
return;
}
}
ZWave_processSendStack($hash, "next") if(@{$ss} == 1);
return undef;
}