From cd7a489ea95418c3230672212350f08c8b875fb0 Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 9 Jun 2020 20:10:58 -0400 Subject: [PATCH] Sometimes legacy DFU does not work #1477 --- java_console/models/src/com/rusefi/rusEFIVersion.java | 2 +- java_console/ui/src/com/rusefi/maintenance/DfuFlasher.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/java_console/models/src/com/rusefi/rusEFIVersion.java b/java_console/models/src/com/rusefi/rusEFIVersion.java index 7c3be58070..ee0dae99de 100644 --- a/java_console/models/src/com/rusefi/rusEFIVersion.java +++ b/java_console/models/src/com/rusefi/rusEFIVersion.java @@ -3,6 +3,6 @@ package com.rusefi; import java.util.concurrent.atomic.AtomicReference; public class rusEFIVersion { - public static final int CONSOLE_VERSION = 20200608; + public static final int CONSOLE_VERSION = 20200609; public static AtomicReference firmwareVersion = new AtomicReference<>("N/A"); } diff --git a/java_console/ui/src/com/rusefi/maintenance/DfuFlasher.java b/java_console/ui/src/com/rusefi/maintenance/DfuFlasher.java index c450e6d196..f76fe19c19 100644 --- a/java_console/ui/src/com/rusefi/maintenance/DfuFlasher.java +++ b/java_console/ui/src/com/rusefi/maintenance/DfuFlasher.java @@ -98,8 +98,10 @@ public class DfuFlasher { String errorResponse = ExecHelper.executeCommand(FirmwareFlasher.BINARY_LOCATION, FirmwareFlasher.BINARY_LOCATION + File.separator + getDfuCommand(), DFU_BINARY, wnd, stdout); - // looks like sometimes we are not catching the last line of the response? 'Upgrade' happens before 'Verify' - if (stdout.toString().contains("Verify successful") || stdout.toString().contains("Upgrade successful")) { + if (stdout.toString().contains("0x12340005")) { + wnd.appendMsg("Driver issue? Maybe driver conflict with STM32Cube? rusEFI currently uses older incompatible driver"); + } else if (stdout.toString().contains("Verify successful") || stdout.toString().contains("Upgrade successful")) { + // looks like sometimes we are not catching the last line of the response? 'Upgrade' happens before 'Verify' wnd.appendMsg("SUCCESS!"); } else { if (stdout.length() == 0 && errorResponse.length() == 0) {