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

Second choice: current folder 

only:uaefi
This commit is contained in:
rusEFI LLC 2025-02-13 20:52:07 -05:00
parent 456a25842e
commit 60469a0c65
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java
View File

@ -28,7 +28,7 @@ import static com.rusefi.core.FindFileHelper.findSrecFile;
public class Autoupdate { public class Autoupdate {
private static final Logging log = getLogging(Autoupdate.class); 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(); private static final String TITLE = getTitle();

10
java_console/shared_io/src/main/java/com/rusefi/core/FindFileHelper.java
View File

@ -13,6 +13,8 @@ public class FindFileHelper {
* Same .bin used by primary DFU and a bit unneeded ST-LINK options * 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"; public static final String FIRMWARE_BIN_FILE = INPUT_FILES_PATH + "/" + "rusefi.bin";
private static final String PREFIX = "";
private static final String SUFFIX = "srec";
@Nullable @Nullable
public static String findFile(String fileDirectory, String prefix, String suffix) { public static String findFile(String fileDirectory, String prefix, String suffix) {
@ -33,7 +35,13 @@ public class FindFileHelper {
@Nullable @Nullable
public static String findSrecFile() { 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() { public static boolean isObfuscated() {

2
java_console/shared_io/src/main/java/com/rusefi/core/rusEFIVersion.java
View File

@ -10,7 +10,7 @@ public interface rusEFIVersion {
* *** BE CAREFUL WE HAVE SEPARATE AUTOUPDATE_VERSION also managed manually *** * *** BE CAREFUL WE HAVE SEPARATE AUTOUPDATE_VERSION also managed manually ***
* @see com.rusefi.autoupdate.Autoupdate#AUTOUPDATE_VERSION * @see com.rusefi.autoupdate.Autoupdate#AUTOUPDATE_VERSION
*/ */
int CONSOLE_VERSION = 20250210; int CONSOLE_VERSION = 20250213;
AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A"); AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
static long classBuildTimeMillis() { static long classBuildTimeMillis() {