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

Dont use select to check for data, because on windows never returns true.

Browse Source 
Take use of newly ReadyFn implemented with $PortObj->status


git-svn-id: https://svn.fhem.de/fhem/trunk@179 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tdressler
2008-05-11 17:34:07 +00:00
parent 70ed380e54
commit 77c61abcb7
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
fhem/FHEM/87_WS2000.pm
View File

@@ -4,7 +4,7 @@ package main;
# Modul for FHEM # Modul for FHEM
# #
# contributed by thomas dressler 2008 # contributed by thomas dressler 2008
# $Id: 87_WS2000.pm,v 1.1 2008-05-10 21:10:29 tdressler Exp $ # $Id: 87_WS2000.pm,v 1.2 2008-05-11 17:34:07 tdressler Exp $
########################### ###########################
use strict; use strict;
use Switch; use Switch;
@@ -13,7 +13,7 @@ use warnings;
#prototypes to make komodo happy #prototypes to make komodo happy
use vars qw{%attr %defs}; use vars qw{%attr %defs};
sub Log($$); sub Log($$);
our $FH;
#################################### ####################################
# WS2000_Initialize # WS2000_Initialize
# Implements Initialize function # Implements Initialize function
@@ -31,7 +31,7 @@ sub WS2000_Initialize($)
$hash->{UndefFn} = "WS2000_Undef"; $hash->{UndefFn} = "WS2000_Undef";
$hash->{GetFn} = "WS2000_Get"; $hash->{GetFn} = "WS2000_Get";
$hash->{SetFn} = "WS2000_Set"; $hash->{SetFn} = "WS2000_Set";
#$hash->{ParseFn} = "WS2000_Parse"; $hash->{ReadyFn} = "WS2000_Ready";
$hash->{ReadFn} ="WS2000_Read"; $hash->{ReadFn} ="WS2000_Read";
$hash->{ListFn} ="WS2000_List"; $hash->{ListFn} ="WS2000_List";
$hash->{AttrList}= "model:WS2000 rain altitude loglevel:0,1,2,3,4,5"; $hash->{AttrList}= "model:WS2000 rain altitude loglevel:0,1,2,3,4,5";
@@ -49,7 +49,8 @@ WS2000_Define($$)
delete $hash->{po}; delete $hash->{po};
delete $hash->{socket}; delete $hash->{socket};
delete $hash->{FD}; delete $hash->{FD};
my $quiet=0; my $ws2000_cfg='ws2000.cfg';
my $quiet=1;
my $name=$hash->{NAME}; my $name=$hash->{NAME};
my $PortName = $a[2]; my $PortName = $a[2];
my $PortObj; my $PortObj;
@@ -74,11 +75,12 @@ WS2000_Define($$)
return "Can't use Win32::SerialPort $@\n"; return "Can't use Win32::SerialPort $@\n";
} }
$PortObj = new Win32::SerialPort ($PortName, $quiet); $PortObj = new Win32::SerialPort ($PortName, $quiet);
if ($PortObj) { if (!$PortObj) {
$hash->{STATE} = "error opening device"; $hash->{STATE} = "error opening device";
Log 1,"Error opening Serial Device $PortName"; Log 1,"Error opening Serial Device $PortName";
return "Can't open PortName: $^E\n"; return "Can't open Device $PortName: $^E\n";
} }
#$hash->{FD}=$PortObj->{_HANDLE};
} else { } else {
eval ("use Device::SerialPort;"); eval ("use Device::SerialPort;");
if ($@) { if ($@) {
@@ -87,11 +89,12 @@ WS2000_Define($$)
return "Can't Device::SerialPort $@\n"; return "Can't Device::SerialPort $@\n";
} }
$PortObj = new Device::SerialPort ($PortName, $quiet); $PortObj = new Device::SerialPort ($PortName, $quiet);
if ($PortObj) { if (!$PortObj) {
$hash->{STATE} = "error opening device"; $hash->{STATE} = "error opening device";
Log 1,"Error opening Serial Device $PortName"; Log 1,"Error opening Serial Device $PortName";
return "Can't open PortName: $^E\n"; return "Can't open Device $PortName: $^E\n";
} }
#$hash->{FD}=$PortObj->FILENO;
} }
#Parameter 19200,8,2,Odd,None #Parameter 19200,8,2,Odd,None
$PortObj->baudrate(19200); $PortObj->baudrate(19200);
@@ -104,7 +107,6 @@ WS2000_Define($$)
return "Serial write Settings failed!\n"; return "Serial write Settings failed!\n";
} }
$hash->{po}=$PortObj; $hash->{po}=$PortObj;
$hash->{FD}=$PortObj->FILENO;
$hash->{socket}=0; $hash->{socket}=0;
}elsif($PortName=~/([\w.]+):(\d{1,5})/){ }elsif($PortName=~/([\w.]+):(\d{1,5})/){
@@ -158,6 +160,21 @@ WS2000_Undef($$)
return undef; return undef;
} }
#####################################
# WS2000_Set
# implement SetFn
# currently nothing to set
#
sub
WS2000_Ready($$)
{
my ($hash, $dev) = @_;
my $po=$hash->{po};
return undef if !$po;
my ($BlockingFlags, $InBytes, $OutBytes, $ErrorFlags)=$po->status;
return ($InBytes>0);
}
##################################### #####################################
# WS2000_Set # WS2000_Set
# implement SetFn # implement SetFn
@@ -298,7 +315,7 @@ WS2000_Parse($$) {
#duplicate check (repeater?) #duplicate check (repeater?)
my $prevmsg=$hash->{READINGS}{RAW}{VAL}||''; my $prevmsg=$hash->{READINGS}{RAW}{VAL}||'';
my $prevtime=$hash->{READINGS}{RAW}{TIME}||0; my $prevtime=$hash->{READINGS}{RAW}{TIME}||0;
if (($prevmsg eq $msg) && ((time() - $prevtime) <3)) { if (($prevmsg eq $msg) && ((time() - $prevtime) <10)) {
Log 4,"$name check: Duplicate detected"; Log 4,"$name check: Duplicate detected";
return undef; return undef;
} }