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

Console to check status of stm32 bootloader driver fix #4625

This commit is contained in:
rusefillc 2022-09-26 02:55:44 -04:00
parent e107ebc313
commit bde3a46401
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
package com.rusefi.maintenance;
import com.opensr5.ini.IniFileModel;
import com.rusefi.ConsoleUI;
import com.rusefi.Launcher;
import com.rusefi.Timeouts;
import com.rusefi.autodetect.PortDetector;
@ -32,6 +31,7 @@ import static com.rusefi.StartupFrame.appendBundleName;
public class DfuFlasher {
private static final String DFU_BINARY_LOCATION = Launcher.TOOLS_PATH + File.separator + "STM32_Programmer_CLI/bin";
private static final String DFU_BINARY = "STM32_Programmer_CLI.exe";
public static final String WMIC_DRIVER_QUERY_COMMAND = "wmic path win32_pnpentity where \"Caption like 'STM32 Bootloader'\" get Caption,ConfigManagerErrorCode /format:list";
public static void doAutoDfu(Object selectedItem, JComponent parent) {
if (selectedItem == null) {
@ -131,6 +131,13 @@ public class DfuFlasher {
}
private static void executeDFU(StatusWindow wnd) {
boolean driverIsHappy = detectSTM32BootloaderDriverState(wnd);
if (!driverIsHappy) {
wnd.append("*** DRIVER ERROR? *** Did you have a chance to try 'Install Drivers' button on top of rusEFI console start screen?");
wnd.setErrorState(true);
return;
}
StringBuffer stdout = new StringBuffer();
String errorResponse;
try {
@ -161,6 +168,15 @@ public class DfuFlasher {
}
}
private static boolean detectSTM32BootloaderDriverState(StatusWindow wnd) {
StringBuffer output = new StringBuffer();
StringBuffer error = new StringBuffer();
ExecHelper.executeCommand(WMIC_DRIVER_QUERY_COMMAND, wnd, output, error, null);
wnd.append(output.toString());
wnd.append(error.toString());
return output.toString().contains("ConfigManagerErrorCode=0");
}
private static void appendWindowsVersion(StatusWindow wnd) {
wnd.append("ERROR: does not look like DFU has worked!");
}

7
java_console/ui/src/main/java/com/rusefi/maintenance/ExecHelper.java
View File

@ -69,9 +69,14 @@ public class ExecHelper {
return error.toString();
}
File workingDir = new File(workingDirPath);
return executeCommand(command, wnd, output, error, workingDir);
}
@NotNull
public static String executeCommand(String command, StatusConsumer wnd, StringBuffer output, StringBuffer error, File workingDir) {
wnd.append("Executing " + command);
try {
File workingDir = new File(workingDirPath);
Process p = Runtime.getRuntime().exec(command, null, workingDir);
startStreamThread(p, p.getInputStream(), output, wnd);
startStreamThread(p, p.getErrorStream(), error, wnd);