mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-28 23:14:10 +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:
parent
c82e8082f4
commit
1907fc7bf3
@ -4230,6 +4230,16 @@ ZWave_addToSendStack($$$)
|
|||||||
if($cmd =~ m/^......988[01].*/) {
|
if($cmd =~ m/^......988[01].*/) {
|
||||||
Log3 $hash->{NAME}, 5, "$hash->{NAME}: Sendstack bypassed for $cmd";
|
Log3 $hash->{NAME}, 5, "$hash->{NAME}: Sendstack bypassed for $cmd";
|
||||||
} else {
|
} 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});
|
return "Scheduled for sending after WAKEUP" if(!$hash->{wakeupAlive});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4242,16 +4252,6 @@ ZWave_addToSendStack($$$)
|
|||||||
return ZWave_addToSendStack($hash, $type, $cmd);
|
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);
|
ZWave_processSendStack($hash, "next") if(@{$ss} == 1);
|
||||||
return undef;
|
return undef;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user