FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues 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@6289 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess 2014-07-20 21:13:33 +00:00
parent d0967f46f0
commit 0e761abcf5
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/FHEM/00_OWX_ASYNC.pm
View File

@ -127,7 +127,7 @@ my %attrs = (
);
#-- some globals needed for the 1-Wire module
$owx_async_version=5.7;
$owx_async_version=5.8;
#-- Debugging 0,1,2,3
$owx_async_debug=0;
@ -277,7 +277,7 @@ sub OWX_ASYNC_Read ($) {
my ($hash) = @_;
Log3 ($hash->{NAME},5,"OWX_ASYNC_Read") if ($owx_async_debug > 2);
if (defined $hash->{ASYNC}) {
$hash->{ASYNC}->poll($hash);
$hash->{ASYNC}->poll();
};
OWX_ASYNC_RunTasks($hash);
};
@ -291,7 +291,13 @@ sub OWX_ASYNC_Disconnect($) {
delete $hash->{ASYNC};
};
$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);
my $master = $hash->{TYPE} eq "OWX_ASYNC" ? $hash : $hash->{IODev};
do {
die "interface $master->{INTERFACE} not active" unless defined $hash->{ASYNC};
$hash->{ASYNC}->poll($hash);
die "interface $master->{INTERFACE} not active" unless defined $master->{ASYNC};
$master->{ASYNC}->poll();
OWX_ASYNC_RunTasks($master);
$task_state = $task->PT_STATE();
} while ($task_state == PT_INITIAL or $task_state == PT_WAITING or $task_state == PT_YIELDED);

8
fhem/FHEM/OWX_SER.pm
View File

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