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

bundle name into DFU window title

This commit is contained in:
rusefi 2021-09-26 15:20:01 -04:00
parent b41f9d3777
commit a57b4c58a9
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java_console/io/src/main/java/com/rusefi/io/DfuHelper.java
View File

@ -1,5 +1,6 @@
package com.rusefi.io;
import com.rusefi.FileLog;
import com.rusefi.RusEfiSignature;
import com.rusefi.SignatureHelper;
import com.rusefi.autoupdate.Autoupdate;
@ -9,6 +10,9 @@ import com.rusefi.config.generated.Fields;
import javax.swing.*;
import java.io.IOException;
import static com.rusefi.Timeouts.SECOND;
import static com.rusefi.binaryprotocol.BinaryProtocol.sleep;
public class DfuHelper {
public static void sendDfuRebootCommand(IoStream stream, StringBuilder messages) {
byte[] command = BinaryProtocol.getTextCommandBytes(Fields.CMD_REBOOT_DFU);
@ -26,11 +30,18 @@ public class DfuHelper {
String bundleName = Autoupdate.readBundleFullName();
if (bundleName != null && s != null) {
if (!bundleName.equalsIgnoreCase(s.getBundle())) {
JOptionPane.showMessageDialog(parent, String.format("You have \"%s\" controller does not look right to program it with \"%s\"", s.getBundle(), bundleName));
String message = String.format("You have \"%s\" controller does not look right to program it with \"%s\"", s.getBundle(), bundleName);
FileLog.MAIN.logLine(message);
JOptionPane.showMessageDialog(parent, message);
// in case of mismatched bundle type we are supposed do close connection
// and properly handle the case of user hitting "Update Firmware" again
// closing connection is a mess on Windows so it's simpler to just exit
new Thread(() -> {
// let's have a delay and separate thread to address
// "wrong bundle" warning text sometimes not visible #3267
sleep(5 * SECOND);
System.exit(-5);
}).start();
return false;
}
}