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

Auto DFU throws NPE in case of no ports connected fix #2949

This commit is contained in:
rusefi 2021-07-11 17:01:52 -04:00
parent 39448e3c79
commit 0a42b1c701
3 changed files with 11 additions and 6 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/rusEFIVersion.java
View File

@ -6,7 +6,7 @@ import java.net.URL;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
public class rusEFIVersion { public class rusEFIVersion {
public static final int CONSOLE_VERSION = 20210618; public static final int CONSOLE_VERSION = 20210711;
public static AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A"); public static AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
public static long classBuildTimeMillis() { public static long classBuildTimeMillis() {

13
java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java
View File

@ -8,7 +8,6 @@ import com.rusefi.autodetect.PortDetector;
import com.rusefi.io.DfuHelper; import com.rusefi.io.DfuHelper;
import com.rusefi.io.IoStream; import com.rusefi.io.IoStream;
import com.rusefi.io.serial.SerialIoStreamJSerialComm; import com.rusefi.io.serial.SerialIoStreamJSerialComm;
import com.rusefi.ui.StatusConsumer;
import com.rusefi.ui.StatusWindow; import com.rusefi.ui.StatusWindow;
import com.rusefi.ui.util.URLLabel; import com.rusefi.ui.util.URLLabel;
@ -33,15 +32,21 @@ public class DfuFlasher {
button.addActionListener(new ActionListener() { button.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent event) { 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()); manualButton.addActionListener(e -> runDfuProgramming());
} }
public static void doAutoDfu(JComboBox<String> comboPorts) { public static void doAutoDfu(Object selectedItem) {
String port = comboPorts.getSelectedItem().toString(); String port = selectedItem.toString();
StringBuilder messages = new StringBuilder(); StringBuilder messages = new StringBuilder();
if (!PortDetector.isAutoPort(port)) { if (!PortDetector.isAutoPort(port)) {

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

@ -56,7 +56,7 @@ public class ProgramSelector {
// todo: add ST-LINK no-assert mode // todo: add ST-LINK no-assert mode
if (isAutoDfu) { if (isAutoDfu) {
DfuFlasher.doAutoDfu(comboPorts); DfuFlasher.doAutoDfu(comboPorts.getSelectedItem());
} else if (isManualDfu){ } else if (isManualDfu){
DfuFlasher.runDfuProgramming(); DfuFlasher.runDfuProgramming();
} else { } else {