rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

integration pain

This commit is contained in:
rusefillc 2024-02-03 13:03:56 -05:00
parent c2b5fea477
commit b6ad0520ea
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java
View File

@ -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<String> firmwareVersion = new AtomicReference<>("N/A");
static long classBuildTimeMillis() {

2
java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java
View File

@ -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);

11
java_console/ui/src/main/java/com/rusefi/StartupFrame.java
View File

@ -245,16 +245,9 @@ public class StartupFrame {
private void connectButtonAction(JComboBox<String> 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);
}
/**