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

only: utilities to locate srec

This commit is contained in:
rusefillc 2024-04-01 16:44:53 -04:00
parent 781ef5873d
commit 0b67f00c04
3 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
java_console/inifile/src/main/java/com/opensr5/ini/IniFileModel.java
View File

@ -2,7 +2,7 @@ package com.opensr5.ini;
import com.devexperts.logging.Logging;
import com.opensr5.ini.field.*;
import org.jetbrains.annotations.Nullable;
import com.rusefi.core.FindFileHelper;
import java.io.*;
import java.util.*;
@ -80,22 +80,7 @@ public class IniFileModel {
}
private static String findMetaInfoFile(String iniFilePath) {
return findFile(iniFilePath, RUSEFI_INI_PREFIX, RUSEFI_INI_SUFFIX);
}
@Nullable
public static String findFile(String fileDirectory, String prefix, String suffix) {
File dir = new File(fileDirectory);
if (!dir.isDirectory())
return null;
log.info("Searching for " + prefix + "*" + suffix + " in " + fileDirectory);
for (String file : Objects.requireNonNull(dir.list())) {
if (file.contains(" "))
continue; // spaces not acceptable
if (file.startsWith(prefix) && file.endsWith(suffix))
return fileDirectory + File.separator + file;
}
return null;
return FindFileHelper.findFile(iniFilePath, RUSEFI_INI_PREFIX, RUSEFI_INI_SUFFIX);
}
private void finishDialog() {

30
java_console/shared_io/src/main/java/com/rusefi/core/FindFileHelper.java Normal file
View File

@ -0,0 +1,30 @@
package com.rusefi.core;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.Objects;
public class FindFileHelper {
private static final String BINARY_PREFIX = "rusefi";
@Nullable
public static String findFile(String fileDirectory, String prefix, String suffix) {
File dir = new File(fileDirectory);
if (!dir.isDirectory())
return null;
System.out.println("Searching for " + prefix + "*" + suffix + " in " + fileDirectory);
for (String file : Objects.requireNonNull(dir.list())) {
if (file.contains(" "))
continue; // spaces not acceptable
if (file.startsWith(prefix) && file.endsWith(suffix))
return fileDirectory + File.separator + file;
}
return null;
}
@Nullable
public static String findSrecFile() {
return findFile("..", BINARY_PREFIX, "srec");
}
}

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

@ -1,6 +1,6 @@
package com.rusefi.maintenance;
import com.opensr5.ini.IniFileModel;
import com.rusefi.core.FindFileHelper;
import com.rusefi.FileLog;
import com.rusefi.Launcher;
import com.rusefi.SerialPortScanner;
@ -12,7 +12,6 @@ import com.rusefi.io.UpdateOperationCallbacks;
import com.rusefi.core.ui.AutoupdateUtil;
import com.rusefi.ui.util.URLLabel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
@ -140,7 +139,7 @@ public class ProgramSelector {
OpenbltJni.OpenbltCallbacks cb = makeOpenbltCallbacks(callbacks);
try {
OpenbltJni.flashCan(findSrecFile(), cb);
OpenbltJni.flashCan(FindFileHelper.findSrecFile(), cb);
callbacks.log("Update completed successfully!");
callbacks.done();
@ -225,7 +224,7 @@ public class ProgramSelector {
OpenbltJni.OpenbltCallbacks cb = makeOpenbltCallbacks(callbacks);
try {
String fileName = findSrecFile();
String fileName = FindFileHelper.findSrecFile();
callbacks.log("flashSerial " + fileName);
OpenbltJni.flashSerial(fileName, port, cb);
@ -239,11 +238,6 @@ public class ProgramSelector {
}
}
@Nullable
private static String findSrecFile() {
return IniFileModel.findFile("..", "rusefi", "srec");
}
@NotNull
public static JComponent createHelpButton() {
return new URLLabel("HOWTO Update Firmware", HELP);