From 6688c2ae6b89936fea619925bd75f80e3ce0e9e8 Mon Sep 17 00:00:00 2001 From: ntruchsess <> Date: Wed, 6 Aug 2014 21:22:43 +0000 Subject: [PATCH] OWX_FRM: fix timeouts caused by commit rev. 6289 git-svn-id: https://svn.fhem.de/fhem/trunk@6368 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/OWX_FRM.pm | 13 +++++++------ fhem/FHEM/OWX_SER.pm | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fhem/FHEM/OWX_FRM.pm b/fhem/FHEM/OWX_FRM.pm index d195dbe74..fff07883b 100644 --- a/fhem/FHEM/OWX_FRM.pm +++ b/fhem/FHEM/OWX_FRM.pm @@ -47,7 +47,7 @@ sub new() { interface => "firmata", #-- module version - version => 4.0 + version => 4.1 }, $class; } @@ -75,12 +75,13 @@ sub Define($$) { # ######################################################################################## -sub initialize($) +sub initialize() { - my ( $self, $hash ) = @_; + my ( $self ) = @_; main::LoadModule("FRM"); my $pin = $self->{pin}; + my $hash = $self->{hash}; my $ret = main::FRM_Init_Pin_Client( $hash, [$pin], PIN_ONEWIRE ); die $ret if ( defined $ret ); my $firmata = main::FRM_Client_FirmataDevice($hash); @@ -266,9 +267,9 @@ sub get_pt_execute($$$$) { }); }; -sub poll($) { - my ( $self, $hash ) = @_; - if ( my $frm = $hash->{IODev} ) { +sub poll() { + my ( $self ) = @_; + if ( my $frm = $self->{hash}->{IODev} ) { main::FRM_poll($frm); } }; diff --git a/fhem/FHEM/OWX_SER.pm b/fhem/FHEM/OWX_SER.pm index 819c13d6b..28442fdb6 100644 --- a/fhem/FHEM/OWX_SER.pm +++ b/fhem/FHEM/OWX_SER.pm @@ -47,7 +47,7 @@ sub new() { my $self = { interface => "serial", #-- module version - version => 5.0, + version => 5.1, alarmdevs => [], devs => [], fams => [], @@ -56,7 +56,7 @@ sub new() { return bless $self,$class; } -sub poll($) { +sub poll() { my ( $self ) = @_; my $hash = $self->{hash}; if(defined($hash->{FD})) {