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

Explicit error in case of error

This commit is contained in:
rusefi 2021-10-07 21:15:46 -04:00
parent 20a2dc287a
commit ea16d71a60
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,15 +40,20 @@ public class DfuFlasher {
if (!PortDetector.isAutoPort(port)) { if (!PortDetector.isAutoPort(port)) {
messages.append("Using selected " + port + "\n"); messages.append("Using selected " + port + "\n");
IoStream stream = SerialIoStreamJSerialComm.openPort(port); IoStream stream = SerialIoStreamJSerialComm.openPort(port);
AtomicReference<String> result = new AtomicReference<>(); AtomicReference<String> signature = new AtomicReference<>();
new SerialAutoChecker(port, new CountDownLatch(1)).checkResponse(stream, new Function<SerialAutoChecker.CallbackContext, Void>() { new SerialAutoChecker(port, new CountDownLatch(1)).checkResponse(stream, new Function<SerialAutoChecker.CallbackContext, Void>() {
@Override @Override
public Void apply(SerialAutoChecker.CallbackContext callbackContext) { public Void apply(SerialAutoChecker.CallbackContext callbackContext) {
result.set(callbackContext.getSignature()); signature.set(callbackContext.getSignature());
return null; return null;
} }
}); });
boolean isSignatureValidatedLocal = DfuHelper.sendDfuRebootCommand(parent, result.get(), stream, messages); if (signature.get() == null) {
JOptionPane.showMessageDialog(ConsoleUI.getFrame(), "rusEFI has not responded on selected " + port + "\n" +
"Maybe try automatic serial port detection?");
return;
}
boolean isSignatureValidatedLocal = DfuHelper.sendDfuRebootCommand(parent, signature.get(), stream, messages);
isSignatureValidated.set(isSignatureValidatedLocal); isSignatureValidated.set(isSignatureValidatedLocal);
} else { } else {
messages.append("Auto-detecting port...\n"); messages.append("Auto-detecting port...\n");