From a3d2fcdedef411db510e707334f360cce04224e5 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Wed, 8 Jul 2015 13:17:28 +0000 Subject: [PATCH] 00_ZWDongle: a command is acked if ZW_SEND_DATA ans answer or request is received (Forum #37418) git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@8917 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_ZWDongle.pm | 4 ++-- fhem/FHEM/10_ZWave.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/00_ZWDongle.pm b/fhem/FHEM/00_ZWDongle.pm index bd3da35d4..eeabd12f5 100755 --- a/fhem/FHEM/00_ZWDongle.pm +++ b/fhem/FHEM/00_ZWDongle.pm @@ -694,8 +694,8 @@ ZWDongle_Read($@) DevIo_SimpleWrite($hash, "06", 1); # Send ACK # SEND_DATA answer: remove message from SendStack. TODO: check callbackId - if($msg =~ m/^0013..(..)/ ){ - my $m = $1; + if($msg =~ m/^0(0|1)13..(..)/ ){ + my ($r, $m) = ($1, $2); my %msg = ('00'=>'OK', '01'=>'NO_ACK', '02'=>'FAIL', '03'=>'NOT_IDLE', '04'=>'NOROUTE' ); $m = $msg{$m} ? $msg{$m} : "UNKNOWN $m"; diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm index 50fbf5a7b..44c4b565c 100755 --- a/fhem/FHEM/10_ZWave.pm +++ b/fhem/FHEM/10_ZWave.pm @@ -1508,7 +1508,7 @@ ZWave_secureInit(@) return undef; # No Event/Reading } elsif($status == 3) { - IOWrite($hash, "secKey ACK", ""); + #IOWrite($hash, "secKey ACK", ""); ZWave_Set($hash, $name, "secNonce"); return undef; # No Event/Reading