FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 01:46:08 +00:00
Code Issues Releases Wiki Activity

OWX_FRM: fix timeouts caused by commit rev. 6289

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6368 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess 2014-08-06 21:22:43 +00:00
parent bd7d717d73
commit 6688c2ae6b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/OWX_FRM.pm
View File

@ -47,7 +47,7 @@ sub new() {
interface => "firmata", interface => "firmata",
#-- module version #-- module version
version => 4.0 version => 4.1
}, $class; }, $class;
} }
@ -75,12 +75,13 @@ sub Define($$) {
# #
######################################################################################## ########################################################################################
sub initialize($) sub initialize()
{ {
my ( $self, $hash ) = @_; my ( $self ) = @_;
main::LoadModule("FRM"); main::LoadModule("FRM");
my $pin = $self->{pin}; my $pin = $self->{pin};
my $hash = $self->{hash};
my $ret = main::FRM_Init_Pin_Client( $hash, [$pin], PIN_ONEWIRE ); my $ret = main::FRM_Init_Pin_Client( $hash, [$pin], PIN_ONEWIRE );
die $ret if ( defined $ret ); die $ret if ( defined $ret );
my $firmata = main::FRM_Client_FirmataDevice($hash); my $firmata = main::FRM_Client_FirmataDevice($hash);
@ -266,9 +267,9 @@ sub get_pt_execute($$$$) {
}); });
}; };
sub poll($) { sub poll() {
my ( $self, $hash ) = @_; my ( $self ) = @_;
if ( my $frm = $hash->{IODev} ) { if ( my $frm = $self->{hash}->{IODev} ) {
main::FRM_poll($frm); main::FRM_poll($frm);
} }
}; };

4
fhem/FHEM/OWX_SER.pm
View File

@ -47,7 +47,7 @@ sub new() {
my $self = { my $self = {
interface => "serial", interface => "serial",
#-- module version #-- module version
version => 5.0, version => 5.1,
alarmdevs => [], alarmdevs => [],
devs => [], devs => [],
fams => [], fams => [],
@ -56,7 +56,7 @@ sub new() {
return bless $self,$class; return bless $self,$class;
} }
sub poll($) { sub poll() {
my ( $self ) = @_; my ( $self ) = @_;
my $hash = $self->{hash}; my $hash = $self->{hash};
if(defined($hash->{FD})) { if(defined($hash->{FD})) {