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

add switch for windows use of Win32::Serialport in _Define and Poll

Browse Source 
(sorry untested, dont have these devices)


git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@178 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tdressler
2008-05-11 17:31:09 +00:00
parent af2d831719
commit e0717ab5e1
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/50_WS300.pm
View File

@@ -125,7 +125,13 @@ WS300_Define($$)
$hash->{READINGS}{WS300Device}{VAL} = "Initializing"; $hash->{READINGS}{WS300Device}{VAL} = "Initializing";
$hash->{READINGS}{WS300Device}{TIME} = TimeNow; $hash->{READINGS}{WS300Device}{TIME} = TimeNow;
my $po = new Device::SerialPort ($a[2]); if ($^O=~/Win/) {
eval ("use Win32::SerialPort;");
my $po = new Win32::SerialPort ($DeviceName);
}else{
eval ("use Device::SerialPort;");
my $po = new Device::SerialPort ($DeviceName);
}
if(!$po) if(!$po)
{ {
$hash->{STATE} = "error opening device"; $hash->{STATE} = "error opening device";
@@ -534,7 +540,11 @@ NEXTPOLL:
$hash->{READINGS}{WS300Device}{VAL} = "disconnected"; $hash->{READINGS}{WS300Device}{VAL} = "disconnected";
$hash->{READINGS}{WS300Device}{TIME} = TimeNow; $hash->{READINGS}{WS300Device}{TIME} = TimeNow;
sleep(1); sleep(1);
if ($^O=~/Win/) {
my $po = new Win32::SerialPort ($devname);
}else{
my $po = new Device::SerialPort ($devname); my $po = new Device::SerialPort ($devname);
}
if($po) if($po)
{ {
$po->reset_error(); $po->reset_error();

14
fhem/FHEM/60_EM.pm
View File

@@ -3,7 +3,7 @@ package main;
use strict; use strict;
use warnings; use warnings;
use Device::SerialPort;
sub EM_Write($$); sub EM_Write($$);
sub EmCrc($$); sub EmCrc($$);
@@ -60,7 +60,14 @@ EM_Define($$)
} }
Log 3, "EM opening device $dev"; Log 3, "EM opening device $dev";
if ($^O=~/Win/) {
eval ("use Win32::SerialPort;");
my $po = new Win32::SerialPort ($dev);
}else{
eval ("use Device::SerialPort;");
my $po = new Device::SerialPort ($dev); my $po = new Device::SerialPort ($dev);
}
return "Can't open $dev: $!" if(!$po); return "Can't open $dev: $!" if(!$po);
Log 3, "EM opened device $dev"; Log 3, "EM opened device $dev";
$po->close(); $po->close();
@@ -277,7 +284,12 @@ EmGetData($$)
$d = EmMakeMsg(pack('H*', $d)); $d = EmMakeMsg(pack('H*', $d));
return undef if(!$dev); return undef if(!$dev);
if ($^O=~/Win/) {
my $serport = new Win32::SerialPort ($dev);
}else{
my $serport = new Device::SerialPort ($dev); my $serport = new Device::SerialPort ($dev);
}
if(!$serport) { if(!$serport) {
Log 1, "EM: Can't open $dev: $!"; Log 1, "EM: Can't open $dev: $!";
return undef; return undef;