mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OWX_FRM: call AfterExecuteFn also for request that don't read 1-Wire data

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5464 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess
2014-04-06 22:20:46 +00:00
parent 389cff69bb
commit d93ea9a646
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/11_OWX_FRM.pm
View File

@@ -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;
};