diff --git a/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java b/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java index 54625d4a00..c3210fc256 100644 --- a/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java +++ b/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java @@ -6,7 +6,7 @@ import java.net.URL; import java.util.concurrent.atomic.AtomicReference; public interface rusEFIVersion { - int CONSOLE_VERSION = 20240130; + int CONSOLE_VERSION = 20240203; AtomicReference firmwareVersion = new AtomicReference<>("N/A"); static long classBuildTimeMillis() { diff --git a/java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java b/java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java index 841f8c5f2d..aad4b690d4 100644 --- a/java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java +++ b/java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java @@ -99,8 +99,6 @@ public enum SerialPortScanner { private static final boolean SHOW_SOCKETCAN = FileLog.isLinux(); - static final String AUTO_SERIAL = "Auto Serial"; - private final Object lock = new Object(); @NotNull private AvailableHardware knownHardware = new AvailableHardware(Collections.emptyList(), false, false, false); diff --git a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java index b0fae20250..58749401a1 100644 --- a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java +++ b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java @@ -245,16 +245,9 @@ public class StartupFrame { private void connectButtonAction(JComboBox comboSpeeds) { BaudRateHolder.INSTANCE.baudRate = Integer.parseInt((String) comboSpeeds.getSelectedItem()); - String selectedPort = comboPorts.getSelectedItem().toString(); - if (SerialPortScanner.AUTO_SERIAL.equals(selectedPort)) { - SerialAutoChecker.AutoDetectResult detectResult = PortDetector.autoDetectPort(StartupFrame.this.frame); - String autoDetectedPort = detectResult == null ? null : detectResult.getSerialPort(); - if (autoDetectedPort == null) - return; - selectedPort = autoDetectedPort; - } + SerialPortScanner.PortResult selectedPort = ((SerialPortScanner.PortResult)comboPorts.getSelectedItem()); disposeFrameAndProceed(); - new ConsoleUI(selectedPort); + new ConsoleUI(selectedPort.port); } /**