From 1a6483757a4b8fc6d2d40efc8758763e5adaefac Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Sat, 4 Dec 2021 14:02:54 -0500
Subject: [PATCH] ELM327 bugfix: port was opened twice

---
 .../main/java/com/rusefi/autodetect/SerialAutoChecker.java  | 2 +-
 .../main/java/com/rusefi/tools/Elm327ConnectorStartup.java  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java b/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
index 72b9491e3f..aa846b5ae6 100644
--- a/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
+++ b/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
@@ -30,7 +30,7 @@ public class SerialAutoChecker {
 
     public String checkResponse(IoStream stream, Function<CallbackContext, Void> callback) {
         if (mode == PortDetector.DetectorMode.DETECT_ELM327) {
-            if (Elm327Connector.checkConnection(serialPort, SerialIoStreamJSerialComm.openPort(serialPort))) {
+            if (Elm327Connector.checkConnection(serialPort, stream)) {
                 return serialPort;
             }
             return null;
diff --git a/java_console/ui/src/main/java/com/rusefi/tools/Elm327ConnectorStartup.java b/java_console/ui/src/main/java/com/rusefi/tools/Elm327ConnectorStartup.java
index 10d88be7be..5b37a0c205 100644
--- a/java_console/ui/src/main/java/com/rusefi/tools/Elm327ConnectorStartup.java
+++ b/java_console/ui/src/main/java/com/rusefi/tools/Elm327ConnectorStartup.java
@@ -2,14 +2,16 @@ package com.rusefi.tools;
 
 import com.devexperts.logging.Logging;
 import com.rusefi.autodetect.PortDetector;
+import com.rusefi.autodetect.SerialAutoChecker;
 import com.rusefi.io.can.Elm327Connector;
 
 public class Elm327ConnectorStartup {
     private final static Logging log = Logging.getLogging(Elm327ConnectorStartup.class);
 
     public static void start() {
-        //String autoDetectedPort = PortDetector.autoDetectSerial(null, PortDetector.DetectorMode.DETECT_ELM327);
-        String autoDetectedPort = "COM73";
+        SerialAutoChecker.AutoDetectResult detectResult = PortDetector.autoDetectSerial(null, PortDetector.DetectorMode.DETECT_ELM327);
+        String autoDetectedPort = detectResult.getSerialPort();
+        //String autoDetectedPort = "COM73";
         if (autoDetectedPort == null) {
             System.err.println(ConsoleTools.RUS_EFI_NOT_DETECTED);
             return;