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 2017-02-18 14:02:28 -05:00
parent a873ce2a74
commit 1ad2c68a64
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20170209;
public static final int CONSOLE_VERSION = 20170218;
public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port";

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

@ -64,7 +64,7 @@ public class UploadChanges {
logger.error("failed to open " + port);
}
PortHolder.setupPort(serialPort, 38400);
logger.info("Looks good");
logger.info("Configuration looks good!");
final ConfigurationImage ci1 = ConfigurationImageFile.readFromFile("rus_saved.bin");

2
java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmd.java
View File

@ -34,7 +34,7 @@ public class BinaryProtocolCmd {
bp = new BinaryProtocol(logger, serialPort);
PortHolder.setupPort(serialPort, 38400);
logger.info("Looks good");
logger.info("Binary looks good!");
bp.switchToBinaryProtocol();
bp.readImage(TsPageSize.IMAGE_SIZE);

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

@ -12,9 +12,9 @@ import java.io.*;
public class FirmwareFlasher extends ProcessStatusWindow {
public static final String IMAGE_DEBUG_FILE = "rusefi_debug.bin";
public static final String IMAGE_RELEASE_FILE = "rusefi_release.bin";
static final String OPENOCD_EXE = "openocd.exe";
static final String BINARY_LOCATION = "openocd";
static final String OPENOCD_CMD = BINARY_LOCATION + File.separator + OPENOCD_EXE + " -f stm32f429disc1.cfg";
static final String OPENOCD_EXE = "openocd/openocd.exe";
static final String BINARY_LOCATION = ".";
static final String OPENOCD_CMD = BINARY_LOCATION + File.separator + OPENOCD_EXE + " -f openocd/stm32f429disc1.cfg";
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";
@ -52,13 +52,13 @@ public class FirmwareFlasher extends ProcessStatusWindow {
wnd.appendMsg(fileName + " not found, cannot proceed !!!");
return;
}
StringBuffer error = executeCommand(OPENOCD_CMD + " -c \"program ../" +
StringBuffer error = executeCommand(OPENOCD_CMD + " -c \"program " +
fileName +
" verify reset exit 0x08000000\"");
if (error.toString().contains(NO_DRIVER_MESSAGE_TAG)) {
wnd.appendMsg(" !!! ERROR: looks like stm32 driver is not installed? The link is above !!!");
} else if (error.toString().contains(SUCCESS_MESSAGE_TAG) && !error.toString().contains(FAILED_MESSAGE_TAG)) {
wnd.appendMsg("!!! Looks good!!!");
} else if (error.toString().contains(SUCCESS_MESSAGE_TAG) && !error.toString().toLowerCase().contains(FAILED_MESSAGE_TAG)) {
wnd.appendMsg("Flashing looks good!");
} else {
wnd.appendMsg("!!! FIRMWARE FLASH: DOES NOT LOOK RIGHT !!!");
}