From 9ffdf77745de699d6bf6f754765a63ed9e46932f Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 10 Jun 2019 21:55:10 -0400 Subject: [PATCH] nicer bundle folder structure and reducing unneeded content #833 --- java_console/ui/src/com/rusefi/Launcher.java | 2 +- .../ui/src/com/rusefi/maintenance/FirmwareFlasher.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 8cfc8388f6..99d802db16 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -46,7 +46,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20190608; + public static final int CONSOLE_VERSION = 20190610; public static final boolean SHOW_STIMULATOR = false; public static final String INPUT_FILES_PATH = ".."; private static final String TAB_INDEX = "main_tab"; diff --git a/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java b/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java index 39789ce23f..cb89ad7580 100644 --- a/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java +++ b/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java @@ -12,8 +12,9 @@ import static com.rusefi.Launcher.INPUT_FILES_PATH; * 2/4/15 */ public class FirmwareFlasher extends ProcessStatusWindow { - public static final String IMAGE_FILE = INPUT_FILES_PATH + File.separator + "rusefi.bin"; - public static final String IMAGE_NO_ASSERTS_FILE = INPUT_FILES_PATH + File.separator + "rusefi_no_asserts.bin"; + // Even on Windows openOCD insists on "/" for path separator + public static final String IMAGE_FILE = INPUT_FILES_PATH + "/" + "rusefi.bin"; + public static final String IMAGE_NO_ASSERTS_FILE = INPUT_FILES_PATH + "/" + "rusefi_no_asserts.bin"; static final String OPENOCD_EXE = "openocd/openocd.exe"; static final String BINARY_LOCATION = "."; private static final String SUCCESS_MESSAGE_TAG = "shutdown command invoked";