From 2b6c55d47bba1a48ac2cc1c3faac923e0f3ac474 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 20 Jan 2017 21:05:22 -0500 Subject: [PATCH] auto-sync --- .../runConfigurations/TS2C_fsioTable1.xml | 22 +++++++++++++++++++ java_console/ui/src/com/rusefi/Launcher.java | 2 +- .../src/com/rusefi/maintenance/EraseChip.java | 2 +- .../rusefi/maintenance/FirmwareFlasher.java | 4 ++-- .../maintenance/ProcessStatusWindow.java | 9 ++++---- 5 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 java_console/.idea/runConfigurations/TS2C_fsioTable1.xml diff --git a/java_console/.idea/runConfigurations/TS2C_fsioTable1.xml b/java_console/.idea/runConfigurations/TS2C_fsioTable1.xml new file mode 100644 index 0000000000..a82585eb59 --- /dev/null +++ b/java_console/.idea/runConfigurations/TS2C_fsioTable1.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index d95b349ace..0ef6ad932c 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -39,7 +39,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20170119; + public static final int CONSOLE_VERSION = 20170120; 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/EraseChip.java b/java_console/ui/src/com/rusefi/maintenance/EraseChip.java index c9d04bf558..fb4c52b46d 100644 --- a/java_console/ui/src/com/rusefi/maintenance/EraseChip.java +++ b/java_console/ui/src/com/rusefi/maintenance/EraseChip.java @@ -10,7 +10,7 @@ public class EraseChip extends ProcessStatusWindow { private final JButton button = new JButton("Erase Chip"); private static final String OPEN_OCD_COMMAND = FirmwareFlasher.OPENOCD_BIN + - " -f interface/stlink-v2.cfg -f board/stm32f4discovery.cfg -c init -c targets -c \"halt\" -c \"flash erase_address 0x08000000 0x080000\" -c shutdown"; + " -c init -c targets -c \"halt\" -c \"flash erase_address 0x08000000 0x080000\" -c shutdown"; public EraseChip() { button.addActionListener(new AbstractAction() { diff --git a/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java b/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java index 75c0d861ad..bb1d9fc99c 100644 --- a/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java +++ b/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java @@ -12,7 +12,7 @@ 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_BIN = "openocd/bin/openocd-0.8.0.exe"; + static final String OPENOCD_BIN = "openocd.exe -f 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"; @@ -50,7 +50,7 @@ public class FirmwareFlasher extends ProcessStatusWindow { wnd.appendMsg(fileName + " not found, cannot proceed !!!"); return; } - StringBuffer error = executeCommand(OPENOCD_BIN + " -f interface/stlink-v2.cfg -f board/stm32f4discovery.cfg -c \"program " + + StringBuffer error = executeCommand(OPENOCD_BIN + " -c \"program ../" + fileName + " verify reset exit 0x08000000\""); if (error.toString().contains(NO_DRIVER_MESSAGE_TAG)) { diff --git a/java_console/ui/src/com/rusefi/maintenance/ProcessStatusWindow.java b/java_console/ui/src/com/rusefi/maintenance/ProcessStatusWindow.java index f4d41d5ea4..f1846ce1c8 100644 --- a/java_console/ui/src/com/rusefi/maintenance/ProcessStatusWindow.java +++ b/java_console/ui/src/com/rusefi/maintenance/ProcessStatusWindow.java @@ -2,10 +2,7 @@ package com.rusefi.maintenance; import com.rusefi.ui.StatusWindow; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; +import java.io.*; /** * (c) Andrey Belomutskiy 2013-2017 @@ -57,7 +54,8 @@ public class ProcessStatusWindow { StringBuffer output = new StringBuffer(); StringBuffer error = new StringBuffer(); try { - Process p = Runtime.getRuntime().exec(command); + File workingDir = new File("openocd"); + Process p = Runtime.getRuntime().exec(command, null, workingDir); startStreamThread(p, p.getInputStream(), output); startStreamThread(p, p.getErrorStream(), error); p.waitFor(); @@ -66,6 +64,7 @@ public class ProcessStatusWindow { } catch (InterruptedException e) { wnd.appendMsg("WaitError: " + e); } + wnd.appendMsg("Done!"); return error; }