From dccc7c40aae137637348a1f3f7bd7a932a59d0a4 Mon Sep 17 00:00:00 2001 From: charlie71 <> Date: Mon, 21 Aug 2017 07:50:47 +0000 Subject: [PATCH] 44_S7: S5 fix for checking serial port support in win environment git-svn-id: https://svn.fhem.de/fhem/trunk@14939 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/44_S7_S5Client.pm | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/fhem/FHEM/44_S7_S5Client.pm b/fhem/FHEM/44_S7_S5Client.pm index 107965a4a..37e5210ef 100644 --- a/fhem/FHEM/44_S7_S5Client.pm +++ b/fhem/FHEM/44_S7_S5Client.pm @@ -9,14 +9,6 @@ use AutoLoader; require "44_S7_Client.pm"; -#if ( OS_Linux() ) { -use Device::SerialPort; - -#} -#else { -# use Win32::SerialPort; -#} - package S5Client; #use S7ClientBase; @@ -485,13 +477,14 @@ sub S5ConnectPLCAS511($$) { my $b1 = ""; my $ttyPort; - #if ( OS_Linux() ) { - $self->{serial} = new Device::SerialPort($portName); + if ($^O=~/Win/) { + eval ("use Win32::SerialPort;"); + $self->{serial} = new Win32::SerialPort ($portName); + }else{ + eval ("use Device::SerialPort;"); + $self->{serial} = new Device::SerialPort ($portName); + } - #} - #else { - # $ttyPort = new Win32::SerialPort( $portName ); - #} main::Log3( undef, 3, "Can't open serial port $portName" ) unless ( $self->{serial} );