Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

OWX_ASYNC: unset present on disconnect, OWX_SER: fix detection of disconnect

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@6289 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess 2014-07-20 21:13:33 +00:00
parent 0a86fb09eb
commit 56b9ae0837
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
FHEM/00_OWX_ASYNC.pm
View File

@ -127,7 +127,7 @@ my %attrs = (
); );
#-- some globals needed for the 1-Wire module #-- some globals needed for the 1-Wire module
$owx_async_version=5.7; $owx_async_version=5.8;
#-- Debugging 0,1,2,3 #-- Debugging 0,1,2,3
$owx_async_debug=0; $owx_async_debug=0;
@ -277,7 +277,7 @@ sub OWX_ASYNC_Read ($) {
my ($hash) = @_; my ($hash) = @_;
Log3 ($hash->{NAME},5,"OWX_ASYNC_Read") if ($owx_async_debug > 2); Log3 ($hash->{NAME},5,"OWX_ASYNC_Read") if ($owx_async_debug > 2);
if (defined $hash->{ASYNC}) { if (defined $hash->{ASYNC}) {
$hash->{ASYNC}->poll($hash); $hash->{ASYNC}->poll();
}; };
OWX_ASYNC_RunTasks($hash); OWX_ASYNC_RunTasks($hash);
}; };
@ -291,7 +291,13 @@ sub OWX_ASYNC_Disconnect($) {
delete $hash->{ASYNC}; delete $hash->{ASYNC};
}; };
$hash->{STATE} = "disconnected" if $hash->{STATE} eq "Active"; $hash->{STATE} = "disconnected" if $hash->{STATE} eq "Active";
GP_ForallClients($hash,\&RemoveInternalTimer,undef); $hash->{PRESENT} = 0;
GP_ForallClients($hash,sub {
my ($client) = @_;
RemoveInternalTimer($client);
readingsSingleUpdate($client,"present",0,$client->{PRESENT});
$client->{PRESENT} = 0;
},undef);
}; };
######################################################################################## ########################################################################################
@ -994,8 +1000,8 @@ sub OWX_ASYNC_RunToCompletion($$) {
OWX_ASYNC_Schedule($hash,$task); OWX_ASYNC_Schedule($hash,$task);
my $master = $hash->{TYPE} eq "OWX_ASYNC" ? $hash : $hash->{IODev}; my $master = $hash->{TYPE} eq "OWX_ASYNC" ? $hash : $hash->{IODev};
do { do {
die "interface $master->{INTERFACE} not active" unless defined $hash->{ASYNC}; die "interface $master->{INTERFACE} not active" unless defined $master->{ASYNC};
$hash->{ASYNC}->poll($hash); $master->{ASYNC}->poll();
OWX_ASYNC_RunTasks($master); OWX_ASYNC_RunTasks($master);
$task_state = $task->PT_STATE(); $task_state = $task->PT_STATE();
} while ($task_state == PT_INITIAL or $task_state == PT_WAITING or $task_state == PT_YIELDED); } while ($task_state == PT_INITIAL or $task_state == PT_WAITING or $task_state == PT_YIELDED);

8
FHEM/OWX_SER.pm
View File

@ -66,11 +66,11 @@ sub poll($) {
my ( $self ) = @_; my ( $self ) = @_;
my $hash = $self->{hash}; my $hash = $self->{hash};
if(defined($hash->{FD})) { if(defined($hash->{FD})) {
my $rin = ''; my ($rout, $rin) = ('', '');
my $win = '';
vec($rin, $hash->{FD}, 1) = 1; vec($rin, $hash->{FD}, 1) = 1;
vec($win, $hash->{FD}, 1) = 1; select($rout=$rin, undef, undef, 0.1);
if (select($rin, $win, $rin | $win, 2)) { #TODO: implement attribute based timeout my $mfound = vec($rout, $hash->{FD}, 1);
if ($mfound) {
main::OWX_ASYNC_Disconnect($hash) unless $self->read(); main::OWX_ASYNC_Disconnect($hash) unless $self->read();
} }
} }