mirror of https://github.com/rusefi/rusefi.git
integration pain
This commit is contained in:
parent
c2b5fea477
commit
b6ad0520ea
|
@ -6,7 +6,7 @@ import java.net.URL;
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
import java.util.concurrent.atomic.AtomicReference;
|
||||||
|
|
||||||
public interface rusEFIVersion {
|
public interface rusEFIVersion {
|
||||||
int CONSOLE_VERSION = 20240130;
|
int CONSOLE_VERSION = 20240203;
|
||||||
AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
|
AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
|
||||||
|
|
||||||
static long classBuildTimeMillis() {
|
static long classBuildTimeMillis() {
|
||||||
|
|
|
@ -99,8 +99,6 @@ public enum SerialPortScanner {
|
||||||
|
|
||||||
private static final boolean SHOW_SOCKETCAN = FileLog.isLinux();
|
private static final boolean SHOW_SOCKETCAN = FileLog.isLinux();
|
||||||
|
|
||||||
static final String AUTO_SERIAL = "Auto Serial";
|
|
||||||
|
|
||||||
private final Object lock = new Object();
|
private final Object lock = new Object();
|
||||||
@NotNull
|
@NotNull
|
||||||
private AvailableHardware knownHardware = new AvailableHardware(Collections.emptyList(), false, false, false);
|
private AvailableHardware knownHardware = new AvailableHardware(Collections.emptyList(), false, false, false);
|
||||||
|
|
|
@ -245,16 +245,9 @@ public class StartupFrame {
|
||||||
|
|
||||||
private void connectButtonAction(JComboBox<String> comboSpeeds) {
|
private void connectButtonAction(JComboBox<String> comboSpeeds) {
|
||||||
BaudRateHolder.INSTANCE.baudRate = Integer.parseInt((String) comboSpeeds.getSelectedItem());
|
BaudRateHolder.INSTANCE.baudRate = Integer.parseInt((String) comboSpeeds.getSelectedItem());
|
||||||
String selectedPort = comboPorts.getSelectedItem().toString();
|
SerialPortScanner.PortResult selectedPort = ((SerialPortScanner.PortResult)comboPorts.getSelectedItem());
|
||||||
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;
|
|
||||||
}
|
|
||||||
disposeFrameAndProceed();
|
disposeFrameAndProceed();
|
||||||
new ConsoleUI(selectedPort);
|
new ConsoleUI(selectedPort.port);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue