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

only:requireBlt

This commit is contained in:
rusefillc 2024-04-02 21:00:14 -04:00
parent 884fcba659
commit a8c3f48430
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ public class Autoupdate {
private static void downloadAndUnzipAutoupdate(String[] bundleFullNameSplit, UpdateMode mode, String baseUrl) {
try {
String boardName = bundleFullNameSplit[2];
String suffix = isObfuscated() ? "_obfuscated_public" : "";
String suffix = FindFileHelper.isObfuscated() ? "_obfuscated_public" : "";
String zipFileName = "rusefi_bundle_" + boardName + suffix + "_autoupdate" + ".zip";
ConnectionAndMeta connectionAndMeta = new ConnectionAndMeta(zipFileName).invoke(baseUrl);
System.out.println("Remote file " + zipFileName);
@ -133,11 +133,6 @@ public class Autoupdate {
}
}
private static boolean isObfuscated() {
String srecFile = FindFileHelper.findSrecFile();
return srecFile != null && srecFile.contains("obfuscated");
}
private static boolean askUserIfUpdateIsDesired() {
CountDownLatch frameClosed = new CountDownLatch(1);

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

@ -27,4 +27,9 @@ public class FindFileHelper {
public static String findSrecFile() {
return findFile("..", BINARY_PREFIX, "srec");
}
public static boolean isObfuscated() {
String srecFile = findSrecFile();
return srecFile != null && srecFile.contains("obfuscated");
}
}

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

@ -6,7 +6,7 @@ import java.net.URL;
import java.util.concurrent.atomic.AtomicReference;
public interface rusEFIVersion {
int CONSOLE_VERSION = 20240401;
int CONSOLE_VERSION = 20240402;
AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
static long classBuildTimeMillis() {

7
java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java
View File

@ -256,7 +256,8 @@ public class ProgramSelector {
mode.removeAllItems();
if (FileLog.isWindows()) {
if (hasSerialPorts) {
boolean requireBlt = FindFileHelper.isObfuscated();
if (hasSerialPorts && !requireBlt) {
mode.addItem(AUTO_DFU);
}
@ -267,6 +268,9 @@ public class ProgramSelector {
mode.addItem(INSTALL_OPENBLT);
}
}
if (!requireBlt) {
mode.addItem(DFU_SWITCH);
}
if (currentHardware.isStLinkConnected())
mode.addItem(ST_LINK);
if (currentHardware.isPCANConnected())
@ -276,7 +280,6 @@ public class ProgramSelector {
if (hasSerialPorts) {
mode.addItem(OPENBLT_AUTO);
mode.addItem(DFU_SWITCH);
mode.addItem(OPENBLT_SWITCH);
mode.addItem(OPENBLT_MANUAL);
}