From 83662dfc5194d795e098fd49f588beaa0919aa38 Mon Sep 17 00:00:00 2001 From: ntruchsess Date: Sun, 6 Apr 2014 22:20:46 +0000 Subject: [PATCH] OWX_FRM: call AfterExecuteFn also for request that don't read 1-Wire data git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@5464 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/11_OWX_FRM.pm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/11_OWX_FRM.pm b/fhem/FHEM/11_OWX_FRM.pm index e5c572803..4ce2e02dc 100644 --- a/fhem/FHEM/11_OWX_FRM.pm +++ b/fhem/FHEM/11_OWX_FRM.pm @@ -122,8 +122,9 @@ COMMAND_HANDLER: { my $owx_data = pack "C*", @{ $data->{data} }; my $owx_device = $request->{device}; my $context = $request->{context}; - my $writedata = pack "C*", @{ $request->{command}->{'write'} } if ( defined $request->{command}->{'write'} ); - main::OWX_ASYNC_AfterExecute( $self->{hash}, $context, 1, $request->{'reset'}, $owx_device, $writedata, $request->{'read'}, $owx_data ); + my $reqcommand = $request->{command}; + my $writedata = pack "C*", @{ $reqcommand->{'write'} } if ( defined $reqcommand->{'write'} ); + main::OWX_ASYNC_AfterExecute( $self->{hash}, $context, 1, $reqcommand->{'reset'}, $owx_device, $writedata, $reqcommand->{'read'}, $owx_data); delete $self->{requests}->{$id}; last; }; @@ -261,7 +262,8 @@ sub execute($$$$$$$) { }; }; if ($@) { - $self->exit($hash); + main::Log3 $hash->{NAME},1,"OWX_FRM: $@"; + #$self->exit($hash); }; if ($delay and $success) { @@ -288,6 +290,9 @@ sub execute($$$$$$$) { } } } + unless ($numread) { + main::OWX_ASYNC_AfterExecute( $hash, $context, $success, $reset, $owx_dev, $data, $numread, "" ); + } return $success; };