diff --git a/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java b/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java index 76f72d8477..504a2aea29 100644 --- a/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java +++ b/java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java @@ -6,7 +6,7 @@ import java.net.URL; import java.util.concurrent.atomic.AtomicReference; public class rusEFIVersion { - public static final int CONSOLE_VERSION = 20210618; + public static final int CONSOLE_VERSION = 20210711; public static AtomicReference firmwareVersion = new AtomicReference<>("N/A"); public static long classBuildTimeMillis() { diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java b/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java index f473f4f931..b20a492430 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java @@ -8,7 +8,6 @@ import com.rusefi.autodetect.PortDetector; import com.rusefi.io.DfuHelper; import com.rusefi.io.IoStream; import com.rusefi.io.serial.SerialIoStreamJSerialComm; -import com.rusefi.ui.StatusConsumer; import com.rusefi.ui.StatusWindow; import com.rusefi.ui.util.URLLabel; @@ -33,15 +32,21 @@ public class DfuFlasher { button.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent event) { - doAutoDfu(comboPorts); + // todo: better usability would be to disable "Program" port in case of no ports found + Object selectedItem = comboPorts.getSelectedItem(); + if (selectedItem == null) { + JOptionPane.showMessageDialog(comboPorts, "Failed to located serial ports"); + } else { + doAutoDfu(selectedItem); + } } }); manualButton.addActionListener(e -> runDfuProgramming()); } - public static void doAutoDfu(JComboBox comboPorts) { - String port = comboPorts.getSelectedItem().toString(); + public static void doAutoDfu(Object selectedItem) { + String port = selectedItem.toString(); StringBuilder messages = new StringBuilder(); if (!PortDetector.isAutoPort(port)) { diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java index 6529f44658..3f59f7bffa 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java @@ -56,7 +56,7 @@ public class ProgramSelector { // todo: add ST-LINK no-assert mode if (isAutoDfu) { - DfuFlasher.doAutoDfu(comboPorts); + DfuFlasher.doAutoDfu(comboPorts.getSelectedItem()); } else if (isManualDfu){ DfuFlasher.runDfuProgramming(); } else {