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

auto-sync

This commit is contained in:
rusEfi 2015-10-26 16:01:34 -04:00
parent 0885a8adca
commit f70bd90a42
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/svnversion.h
View File

@ -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

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -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";

5
java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java
View File

@ -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 !!!");