From 60469a0c658b6e87b9811bf2adf72ee758f0a8bb Mon Sep 17 00:00:00 2001 From: rusEFI LLC Date: Thu, 13 Feb 2025 20:52:07 -0500 Subject: [PATCH] Second choice: current folder only:uaefi --- .../main/java/com/rusefi/autoupdate/Autoupdate.java | 2 +- .../src/main/java/com/rusefi/core/FindFileHelper.java | 10 +++++++++- .../src/main/java/com/rusefi/core/rusEFIVersion.java | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java b/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java index cf751046a9..6f94c9b7a6 100644 --- a/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java +++ b/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java @@ -28,7 +28,7 @@ import static com.rusefi.core.FindFileHelper.findSrecFile; public class Autoupdate { private static final Logging log = getLogging(Autoupdate.class); - private static final int AUTOUPDATE_VERSION = 20250208; // separate from rusEFIVersion#CONSOLE_VERSION + private static final int AUTOUPDATE_VERSION = 20250213; // separate from rusEFIVersion#CONSOLE_VERSION private static final String TITLE = getTitle(); diff --git a/java_console/shared_io/src/main/java/com/rusefi/core/FindFileHelper.java b/java_console/shared_io/src/main/java/com/rusefi/core/FindFileHelper.java index 64eaad8aa9..a633b08b31 100644 --- a/java_console/shared_io/src/main/java/com/rusefi/core/FindFileHelper.java +++ b/java_console/shared_io/src/main/java/com/rusefi/core/FindFileHelper.java @@ -13,6 +13,8 @@ public class FindFileHelper { * Same .bin used by primary DFU and a bit unneeded ST-LINK options */ public static final String FIRMWARE_BIN_FILE = INPUT_FILES_PATH + "/" + "rusefi.bin"; + private static final String PREFIX = ""; + private static final String SUFFIX = "srec"; @Nullable public static String findFile(String fileDirectory, String prefix, String suffix) { @@ -33,7 +35,13 @@ public class FindFileHelper { @Nullable public static String findSrecFile() { - return findFile(INPUT_FILES_PATH, "", "srec"); + String fileAtFirstLocation = findFile(INPUT_FILES_PATH, PREFIX, SUFFIX); + if (fileAtFirstLocation == null) { + log.info("Second choice: current folder"); + return findFile(".", PREFIX, SUFFIX); + } + + return fileAtFirstLocation; } public static boolean isObfuscated() { diff --git a/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java b/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java index 23a115cfb0..e434b7d8c2 100644 --- a/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java +++ b/java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java @@ -10,7 +10,7 @@ public interface rusEFIVersion { * *** BE CAREFUL WE HAVE SEPARATE AUTOUPDATE_VERSION also managed manually *** * @see com.rusefi.autoupdate.Autoupdate#AUTOUPDATE_VERSION */ - int CONSOLE_VERSION = 20250210; + int CONSOLE_VERSION = 20250213; AtomicReference firmwareVersion = new AtomicReference<>("N/A"); static long classBuildTimeMillis() {