From ec2778fdcfcef8b1c0a3d9fc924a68f56cdcd639 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Thu, 21 May 2020 01:16:14 -0400
Subject: [PATCH] rusEFI console start-up time improvements

---
 README.md                                          |  1 +
 firmware/svnversion.h                              |  6 +++---
 .../io/serial/SerialIoStreamJSerialComm.java       |  5 +++--
 .../ui/src/com/rusefi/autodetect/PortDetector.java | 14 ++++++++++++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 135c76edcf..e97a747bee 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ See https://rusefi.com/forum/viewtopic.php?f=5&t=9
 
 | Release date  | Revision  | Details |
 | ------------  | --------- | ------- |
+| 05/21/2020    | r22961    | rusEFI console start-up time improvements |
 | 04/18/2020    | r22231    | Renix 44-2-2 trigger support added |
 | 04/02/2020    |           | Start button feature |
 | 03/28/2020    |           | Critical error text is now displayed in TunerStudio |
diff --git a/firmware/svnversion.h b/firmware/svnversion.h
index 2e6f79bb3e..6885899bd1 100644
--- a/firmware/svnversion.h
+++ b/firmware/svnversion.h
@@ -1,12 +1,12 @@
 // This file was generated by Version2Header
-// Sat May 16 01:51:18 EDT 2020
+// Thu May 21 01:13:39 EDT 2020
 
 
 #ifndef GIT_HASH
-#define GIT_HASH "c9409ce69379772e2b3cac3016518e56abf97851"
+#define GIT_HASH "c3a0e7e1b9fd9d994514ea508189439f3c8cfc82"
 #endif
 
 
 #ifndef VCS_VERSION
-#define VCS_VERSION "22876"
+#define VCS_VERSION "22961"
 #endif
diff --git a/java_console/io/src/com/rusefi/io/serial/SerialIoStreamJSerialComm.java b/java_console/io/src/com/rusefi/io/serial/SerialIoStreamJSerialComm.java
index 004213b6ed..86c635c697 100644
--- a/java_console/io/src/com/rusefi/io/serial/SerialIoStreamJSerialComm.java
+++ b/java_console/io/src/com/rusefi/io/serial/SerialIoStreamJSerialComm.java
@@ -77,10 +77,11 @@ public class SerialIoStreamJSerialComm implements IoStream {
      * @see PortHolder#connectAndReadConfiguration()
      */
     public static IoStream openPort(String port) {
-        FileLog.LOGGER.info("[SerialIoStreamJSerialComm] " + port);
+        FileLog.LOGGER.info("[SerialIoStreamJSerialComm] openPort " + port);
         SerialPort serialPort = SerialPort.getCommPort(port);
         serialPort.setBaudRate(BaudRateHolder.INSTANCE.baudRate);
-        serialPort.openPort();
+        serialPort.openPort(0);
+//        FileLog.LOGGER.info("[SerialIoStreamJSerialComm] opened " + port);
         return new SerialIoStreamJSerialComm(serialPort, port);
     }
 }
diff --git a/java_console/ui/src/com/rusefi/autodetect/PortDetector.java b/java_console/ui/src/com/rusefi/autodetect/PortDetector.java
index f890b64948..7eacc95bac 100644
--- a/java_console/ui/src/com/rusefi/autodetect/PortDetector.java
+++ b/java_console/ui/src/com/rusefi/autodetect/PortDetector.java
@@ -1,5 +1,6 @@
 package com.rusefi.autodetect;
 
+import com.rusefi.FileLog;
 import jssc.SerialPortList;
 import org.jetbrains.annotations.Nullable;
 
@@ -19,12 +20,12 @@ public class PortDetector {
      * Connect to all serial ports and find out which one respond first
      */
     public static String autoDetectSerial() {
-        String[] serialPorts = SerialPortList.getPortNames();
+        String[] serialPorts = getPortNames();
         if (serialPorts.length == 0) {
             System.err.println("No serial ports detected");
             return null;
         }
-        System.out.println("Trying " + Arrays.toString(serialPorts));
+        FileLog.MAIN.logLine("Trying " + Arrays.toString(serialPorts));
         List<Thread> serialFinder = new ArrayList<>();
         CountDownLatch portFound = new CountDownLatch(1);
         AtomicReference<String> result = new AtomicReference<>();
@@ -38,11 +39,20 @@ public class PortDetector {
         } catch (InterruptedException e) {
             throw new IllegalStateException(e);
         }
+//        FileLog.MAIN.logLine("Found " + result.get());
         for (Thread thread : serialFinder)
             thread.interrupt();
+//        FileLog.MAIN.logLine("Returning " + result.get());
         return result.get();
     }
 
+    private static String[] getPortNames() {
+//        long now = System.currentTimeMillis();
+        String[] portNames = SerialPortList.getPortNames();
+//        FileLog.MAIN.logLine("Took " + (System.currentTimeMillis() - now));
+        return portNames;
+    }
+
     @Nullable
     public static String autoDetectPort(JFrame parent) {
         String autoDetectedPort = autoDetectSerial();