rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rusefi/rusefi

This commit is contained in:
rusEfi 2020-03-11 02:42:17 -04:00
parent 8490fc731d 3d9f030e98
commit 1ce9ed93ec
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ public class DfuFlasher {
// TODO: integration with DFU command line tool // TODO: integration with DFU command line tool
static final String DFU_COMMAND = DFU_BINARY + " -c -d --v --fn " + Launcher.INPUT_FILES_PATH + File.separator + static final String DFU_COMMAND = DFU_BINARY + " -c -d --v --fn " + Launcher.INPUT_FILES_PATH + File.separator +
"rusefi.dfu"; "rusefi.dfu";
private static final String DFU_SETUP_EXE = "https://github.com/rusefi/rusefi_external_utils/raw/master/DFU_mode/DfuSe_Demo_V3.0.6_Setup.exe";
private final JButton button = new JButton("Auto Program via DFU"); private final JButton button = new JButton("Auto Program via DFU");
private final JButton manualButton = new JButton("Manual Program via DFU"); private final JButton manualButton = new JButton("Manual Program via DFU");
@ -81,17 +82,19 @@ public class DfuFlasher {
if (stdout.toString().contains("Verify successful")) { if (stdout.toString().contains("Verify successful")) {
wnd.appendMsg("SUCCESS!"); wnd.appendMsg("SUCCESS!");
} else { } else {
wnd.appendMsg(stdout.length() + " / " + errorResponse.length());
if (stdout.length() == 0 && errorResponse.length() == 0) { if (stdout.length() == 0 && errorResponse.length() == 0) {
// looks like DFU util is not installed properly? // looks like DFU util is not installed properly?
// ugly temporary solution // ugly temporary solution
// see https://github.com/rusefi/rusefi/issues/1170 // see https://github.com/rusefi/rusefi/issues/1170
// see https://github.com/rusefi/rusefi/issues/1182 // see https://github.com/rusefi/rusefi/issues/1182
try { try {
URLLabel.open(new URI("https://github.com/rusefi/rusefi_external_utils/raw/master/DFU_mode/DfuSe_Demo_V3.0.6_Setup.exe")); URLLabel.open(new URI(DFU_SETUP_EXE));
wnd.appendMsg("Please install DfuSe_Demo_V3.0.6_Setup.exe, power cycle your device and try again.");
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
} else {
wnd.appendMsg(stdout.length() + " / " + errorResponse.length());
} }
wnd.appendMsg("ERROR: does not look like DFU has worked!"); wnd.appendMsg("ERROR: does not look like DFU has worked!");
} }