From 22428230f63d8da34d18b92b040e9395e4890399 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 11 Jan 2022 23:35:55 -0500 Subject: [PATCH] rusefi_Console: Too long re-connection time #3305 clean-up --- .../io/src/main/java/com/rusefi/io/LinkConnector.java | 11 ----------- .../io/src/main/java/com/rusefi/io/LinkManager.java | 6 +++--- .../java/com/rusefi/io/serial/StreamConnector.java | 9 --------- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/java_console/io/src/main/java/com/rusefi/io/LinkConnector.java b/java_console/io/src/main/java/com/rusefi/io/LinkConnector.java index ba2a688af1..a8e5fc2039 100644 --- a/java_console/io/src/main/java/com/rusefi/io/LinkConnector.java +++ b/java_console/io/src/main/java/com/rusefi/io/LinkConnector.java @@ -19,10 +19,6 @@ public interface LinkConnector extends LinkDecoder { public void send(String command, boolean fireEvent) { } - @Override - public void restart() { - } - @Override public BinaryProtocol getBinaryProtocol() { return null; @@ -47,11 +43,6 @@ public interface LinkConnector extends LinkDecoder { throw new UnsupportedOperationException(); } - @Override - public void restart() { - throw new UnsupportedOperationException(); - } - @Override public BinaryProtocol getBinaryProtocol() { throw new UnsupportedOperationException(); @@ -63,8 +54,6 @@ public interface LinkConnector extends LinkDecoder { void send(String command, boolean fireEvent) throws InterruptedException; - void restart(); - BinaryProtocol getBinaryProtocol(); default BinaryProtocolState getBinaryProtocolState() { diff --git a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java index 26f91a638a..87316695f3 100644 --- a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java +++ b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java @@ -46,7 +46,7 @@ public class LinkManager implements Closeable { public static final String LOG_VIEWER = "log viewer"; private final CommandQueue commandQueue; - private String lastTriedPort = null; + private String lastTriedPort; private LinkConnector connector = LinkConnector.VOID; private boolean isStarted; @@ -278,8 +278,8 @@ public class LinkManager implements Closeable { close(); // Explicitly kill the connection (call connectors destructor??????) String[] ports = getCommPorts(); - boolean isPortAvaliableAgain = Arrays.stream(ports).anyMatch(lastTriedPort::equals); - if(isPortAvaliableAgain) { + boolean isPortAvailableAgain = Arrays.stream(ports).anyMatch(lastTriedPort::equals); + if (isPortAvailableAgain) { connect(lastTriedPort); } } diff --git a/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java b/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java index 796c366e92..7b6a094cdb 100644 --- a/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java +++ b/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java @@ -49,15 +49,6 @@ public class StreamConnector implements LinkConnector { portHolder.close(); } - @Override - public void restart() { - linkManager.execute(() -> { - linkManager.messageListener.postMessage(StreamConnector.this.getClass(), "Restarting serial IO"); - portHolder.close(); - portHolder.connectAndReadConfiguration(arguments); - }); - } - @Override public String unpack(String packet) { return packet;