From 9f4690cc8b5dc3e8cb3b4701c8a439eacd301d2b Mon Sep 17 00:00:00 2001 From: rusefillc Date: Mon, 26 Sep 2022 02:21:59 -0400 Subject: [PATCH] improvement: replacing popup with line into status window --- .../src/main/java/com/rusefi/maintenance/DfuFlasher.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 8bf2fa79e5..28bb1ab129 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 @@ -43,7 +43,8 @@ public class DfuFlasher { StatusWindow wnd = createStatusWindow(); AtomicBoolean isSignatureValidated = rebootToDfu(parent, port, wnd); - if (isSignatureValidated == null) return; + if (isSignatureValidated == null) + return; if (isSignatureValidated.get()) { if (!ProgramSelector.IS_WIN) { wnd.append("Switched to DFU mode!"); @@ -78,7 +79,7 @@ public class DfuFlasher { } }); if (signature.get() == null) { - JOptionPane.showMessageDialog(ConsoleUI.getFrame(), "rusEFI has not responded on selected " + port + "\n" + + wnd.append("*** ERROR *** rusEFI has not responded on selected " + port + "\n" + "Maybe try automatic serial port detection?"); return null; } @@ -94,7 +95,7 @@ public class DfuFlasher { return null; }).getSerialPort(); if (port == null) { - JOptionPane.showMessageDialog(ConsoleUI.getFrame(), "rusEFI serial port not detected"); + wnd.append("*** ERROR *** rusEFI serial port not detected"); return null; } else { wnd.append("Detected rusEFI on " + port + "\n"); @@ -152,7 +153,6 @@ public class DfuFlasher { } else { wnd.append(stdout.length() + " / " + errorResponse.length()); appendWindowsVersion(wnd); - wnd.append("Windows " + System.getProperty("os.version")); appendDeviceReport(wnd); wnd.setErrorState(true); }