Skip to content

Commit

Permalink
fix prefix for flashed binary
Browse files Browse the repository at this point in the history
  • Loading branch information
mck1117 committed Apr 12, 2023
1 parent eb23fd5 commit ec742fb
Showing 1 changed file with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public static void doAutoDfu(Object selectedItem, JComponent parent) {
if (isSignatureValidated.get()) {
if (!ProgramSelector.IS_WIN) {
wnd.append("Switched to DFU mode!");
wnd.append("rusEFI console can only program on Windows");
wnd.append("FOME console can only program on Windows");
return;
}
submitAction(() -> {
Expand Down Expand Up @@ -81,7 +81,7 @@ public Void apply(SerialAutoChecker.CallbackContext callbackContext) {
}
});
if (signature.get() == null) {
wnd.append("*** ERROR *** rusEFI has not responded on selected " + port + "\n" +
wnd.append("*** ERROR *** FOME has not responded on selected " + port + "\n" +
"Maybe try automatic serial port detection?");
wnd.setErrorState();
return null;
Expand All @@ -99,11 +99,11 @@ public Void apply(SerialAutoChecker.CallbackContext callbackContext) {
return null;
}).getSerialPort();
if (port == null) {
wnd.append("*** ERROR *** rusEFI serial port not detected");
wnd.append("*** ERROR *** FOME serial port not detected");
wnd.setErrorState();
return null;
} else {
wnd.append("Detected rusEFI on " + port + "\n");
wnd.append("Detected FOME on " + port + "\n");
}
}
return isSignatureValidated;
Expand Down Expand Up @@ -135,7 +135,7 @@ public static void runDfuProgramming() {
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.append("*** DRIVER ERROR? *** Did you have a chance to try 'Install Drivers' button on top of FOME console start screen?");
wnd.setErrorState();
return;
}
Expand All @@ -159,7 +159,7 @@ private static void executeDFU(StatusWindow wnd) {
} else if (stdout.toString().contains("Target device not found")) {
wnd.append("ERROR: Device not connected or STM32 Bootloader driver not installed?");
appendWindowsVersion(wnd);
wnd.append("ERROR: Please try installing drivers using 'Install Drivers' button on rusEFI splash screen");
wnd.append("ERROR: Please try installing drivers using 'Install Drivers' button on FOME splash screen");
wnd.append("ERROR: Alternatively please install drivers using Device Manager pointing at 'drivers/silent_st_drivers/DFU_Driver' folder");
appendDeviceReport(wnd);
wnd.setErrorState();
Expand Down Expand Up @@ -213,7 +213,7 @@ private static void timeForDfuSwitch(StatusWindow wnd) {
}

private static String getDfuWriteCommand() throws FileNotFoundException {
String prefix = "rusefi";
String prefix = "fome";
String suffix = ".bin";
String fileName = IniFileModel.findFile(Launcher.INPUT_FILES_PATH, prefix, suffix);
if (fileName == null)
Expand Down Expand Up @@ -246,7 +246,7 @@ static List<String> getDevicesReport() {
BufferedReader stdout = new BufferedReader(new InputStreamReader(powerShellProcess.getInputStream()));
while ((line = stdout.readLine()) != null) {
String lowerCase = line.toLowerCase();
if (!lowerCase.contains("stm32") && !lowerCase.contains("dfu") && !lowerCase.contains("rusefi"))
if (!lowerCase.contains("stm32") && !lowerCase.contains("dfu") && !lowerCase.contains("fome"))
continue;
report.add(line);
}
Expand Down

0 comments on commit ec742fb

Please sign in to comment.