2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-28 02:44:53 +00:00

10_ZWave.pm: use explorerFrames in wakeupNomoreInformation (Forum #39525)

git-svn-id: https://svn.fhem.de/fhem/trunk@9117 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-08-23 12:00:39 +00:00
parent 8ecaaf706e
commit 07bb31b3c5

View File

@ -1161,12 +1161,13 @@ ZWave_userCodeSet($)
} }
sub sub
ZWave_clockAdjust($) ZWave_clockAdjust($$)
{ {
my $d = shift; my ($hash, $d) = @_;
return $d if($d !~ m/^13(..)048104....05$/); return $d if($d !~ m/^13(..)048104....$/);
my ($err, $nd) = ZWave_clockSet(); my ($err, $nd) = ZWave_clockSet();
return "13${1}0481${nd}05"; my $cmdEf = (AttrVal($hash->{NAME}, "noExplorerFrames", 0) == 0 ? "25" : "05");
return "13${1}0481${nd}${cmdEf}${1}";
} }
sub sub
@ -1660,7 +1661,8 @@ ZWave_wakeupTimer($)
if($now - $hash->{lastMsgTimestamp} > 1) { # wakeupNoMoreInformation if($now - $hash->{lastMsgTimestamp} > 1) { # wakeupNoMoreInformation
if($hash->{STATE} ne "TRANSMIT_NO_ACK") { if($hash->{STATE} ne "TRANSMIT_NO_ACK") {
my $nodeId = $hash->{id}; my $nodeId = $hash->{id};
IOWrite($hash, "00", "13${nodeId}02840805"); my $cmdEf = (AttrVal($hash->{NAME}, "noExplorerFrames", 0) == 0 ? "25" : "05");
IOWrite($hash, "00", "13${nodeId}028408${cmdEf}$nodeId");
} }
} else { } else {
InternalTimer($now+0.1, "ZWave_wakeupTimer", $hash, 0); InternalTimer($now+0.1, "ZWave_wakeupTimer", $hash, 0);
@ -1675,7 +1677,7 @@ ZWave_sendWakeup($)
my $wu = $hash->{WakeUp}; my $wu = $hash->{WakeUp};
if($wu && @{$wu}) { if($wu && @{$wu}) {
foreach my $wuCmd (@{$wu}) { foreach my $wuCmd (@{$wu}) {
IOWrite($hash, "00", ZWave_clockAdjust($wuCmd)); IOWrite($hash, "00", ZWave_clockAdjust($hash, $wuCmd));
Log3 $hash, 4, "Sending stored command: $wuCmd"; Log3 $hash, 4, "Sending stored command: $wuCmd";
} }
@{$hash->{WakeUp}}=(); @{$hash->{WakeUp}}=();