diff --git a/firmware/svnversion.h b/firmware/svnversion.h index 1db9e11490..22ac3da45e 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,5 +1,5 @@ // This file was generated by Version2Header -// Tue Oct 20 13:45:22 EDT 2015 +// Mon Oct 26 11:55:08 EDT 2015 #ifndef VCS_VERSION -#define VCS_VERSION "8930" +#define VCS_VERSION "8941" #endif diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index acdfb11d7a..163c9d5025 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see com.rusefi.StartupFrame */ public class Launcher { - public static final int CONSOLE_VERSION = 20151018; + public static final int CONSOLE_VERSION = 20151026; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port"; diff --git a/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java b/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java index f2d3966fb2..8c90de79c0 100644 --- a/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java +++ b/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java @@ -15,6 +15,7 @@ public class FirmwareFlasher extends ProcessStatusWindow { static final String OPENOCD_BIN = "openocd/bin/openocd-0.8.0.exe"; private static final String SUCCESS_MESSAGE_TAG = "shutdown command invoked"; private static final String FAILED_MESSAGE_TAG = "failed"; + private static final String NO_DRIVER_MESSAGE_TAG = "failed with LIBUSB_ERROR_NOT_SUPPORTED"; private final JButton button; private String fileName; @@ -52,7 +53,9 @@ public class FirmwareFlasher extends ProcessStatusWindow { StringBuffer error = executeCommand(OPENOCD_BIN + " -f interface/stlink-v2.cfg -f board/stm32f4discovery.cfg -c \"program " + fileName + " verify reset exit 0x08000000\""); - if (error.toString().contains(SUCCESS_MESSAGE_TAG) && !error.toString().contains(FAILED_MESSAGE_TAG)) { + if (error.toString().contains(NO_DRIVER_MESSAGE_TAG)) { + wnd.appendMsg(" !!! ERROR: looks like stm32 driver is not installe? !!!"); + } else if (error.toString().contains(SUCCESS_MESSAGE_TAG) && !error.toString().contains(FAILED_MESSAGE_TAG)) { wnd.appendMsg("!!! Looks good!!!"); } else { wnd.appendMsg("!!! FIRMWARE FLASH: DOES NOT LOOK RIGHT !!!");