From a4af61f28ac315700d14440ea6e072c1669a9975 Mon Sep 17 00:00:00 2001
From: HCS <>
Date: Thu, 17 Jan 2019 09:34:30 +0000
Subject: [PATCH] 36_LaCrosseGateway.pm: fixed the 'connect to http...' problem
 (back to 18148)

git-svn-id: https://svn.fhem.de/fhem/trunk@18291 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/36_LaCrosseGateway.pm | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/fhem/FHEM/36_LaCrosseGateway.pm b/fhem/FHEM/36_LaCrosseGateway.pm
index f0d3483d8..dc8d3b9e5 100644
--- a/fhem/FHEM/36_LaCrosseGateway.pm
+++ b/fhem/FHEM/36_LaCrosseGateway.pm
@@ -70,8 +70,7 @@ sub LaCrosseGateway_Notify($$) {
 }
 
 #=======================================================================================
-sub LaCrosseGateway_Define($$) {
-  my ($hash, $def) = @_;
+sub LaCrosseGateway_Define($$) {my ($hash, $def) = @_;
   my @a = split("[ \t][ \t]*", $def);
   
   if(@a != 3) {
@@ -87,8 +86,7 @@ sub LaCrosseGateway_Define($$) {
 
   $hash->{Clients} = $clients;
   $hash->{MatchList} = \%matchList;
-  $hash->{TIMEOUT} = 1.0;
-  $hash->{devioLoglevel} = 4;
+  $hash->{TIMEOUT} = 0.5;
 
   if( !defined( $attr{$name}{usbFlashCommand} ) ) {
     $attr{$name}{usbFlashCommand} = "./FHEM/firmware/esptool.py -b 921600 -p [PORT] write_flash -ff 80m -fm dio -fs 4MB-c1 0x00000 [BINFILE] > [LOGFILE] 2>&1"
@@ -435,7 +433,15 @@ sub LaCrosseGateway_Ready($) {
   my ($hash) = @_;
   my $name = $hash->{NAME};
 
-  return LaCrosseGateway_Connect($hash, 1);
+  LaCrosseGateway_Connect($hash, 1);
+
+  # This is relevant for windows/USB only
+  my $po = $hash->{USBDev};
+  my ($BlockingFlags, $InBytes, $OutBytes, $ErrorFlags);
+  if($po) {
+    ($BlockingFlags, $InBytes, $OutBytes, $ErrorFlags) = $po->status;
+  }
+  return ($InBytes && $InBytes>0);
 }
 
 #=======================================================================================
@@ -734,18 +740,13 @@ sub LaCrosseGateway_Connect($;$) {
   my ($hash, $mode) = @_;
   my $name = $hash->{NAME};
   
-  if(DevIo_IsOpen($hash)) {
-    DevIo_CloseDev($hash);
-  }
+  DevIo_CloseDev($hash);
   
   $mode = 0 if!($mode);
   my $enabled = AttrVal($name, "disable", "0") != "1" && !defined($hash->{helper}{FLASHING});
   if($enabled) {
     $hash->{nextOpenDelay} = 2;
-    my $ret = DevIo_OpenDev($hash, $mode, "LaCrosseGateway_DoInit", sub($$){
-        my ($hash, $error) = @_;
-        ####Log 3, "LGW: " . $hash->{NAME} . " " . $error;
-      });
+    my $ret = DevIo_OpenDev($hash, $mode, "LaCrosseGateway_DoInit");
     return $ret;
   }
   
@@ -780,7 +781,7 @@ sub LaCrosseGateway_OnConnectTimer($) {
     my ($timeout, $interval) = split(',', $attrVal);
     my $useOldMethod = $interval;
     $interval = $timeout if !$interval;
-    
+
     InternalTimer(gettimeofday() + $interval, "LaCrosseGateway_OnConnectTimer", $hash, 0);
 
     if(AttrVal($name, "disable", "0") != "1" && !defined($hash->{helper}{FLASHING})) {