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

only:integration in the air!

This commit is contained in:
rusefillc 2023-12-25 22:48:05 -05:00
parent 95ea882ea6
commit b19d674456
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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; import java.util.concurrent.atomic.AtomicReference;
public interface rusEFIVersion { public interface rusEFIVersion {
int CONSOLE_VERSION = 20231120; int CONSOLE_VERSION = 20231225;
AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A"); AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
static long classBuildTimeMillis() { static long classBuildTimeMillis() {

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

@ -9,17 +9,13 @@ import com.rusefi.config.generated.Fields;
import com.rusefi.io.LinkManager; import com.rusefi.io.LinkManager;
import com.rusefi.io.UpdateOperationCallbacks; import com.rusefi.io.UpdateOperationCallbacks;
import com.rusefi.core.ui.AutoupdateUtil; import com.rusefi.core.ui.AutoupdateUtil;
import com.rusefi.ui.StatusWindow;
import com.rusefi.ui.util.URLLabel; import com.rusefi.ui.util.URLLabel;
import com.rusefi.ui.util.UiUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.io.File;
import java.io.FileNotFoundException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Objects; import java.util.Objects;
@ -70,7 +66,7 @@ public class ProgramSelector {
getConfig().getRoot().setProperty(getClass().getSimpleName(), selectedMode); getConfig().getRoot().setProperty(getClass().getSimpleName(), selectedMode);
String jobName = null; String jobName = null;
Consumer<UpdateOperationCallbacks> job = null; Consumer<UpdateOperationCallbacks> job;
Objects.requireNonNull(selectedMode); Objects.requireNonNull(selectedMode);
switch (selectedMode) { switch (selectedMode) {
@ -83,8 +79,10 @@ public class ProgramSelector {
job = DfuFlasher::runDfuProgramming; job = DfuFlasher::runDfuProgramming;
break; break;
case ST_LINK: case ST_LINK:
// todo: add ST-LINK no-assert mode? or not? job = updateOperationCallbacks -> {
FirmwareFlasher.doUpdateFirmware(FirmwareFlasher.IMAGE_FILE, updateFirmware); // todo: add ST-LINK no-assert mode? or not?
FirmwareFlasher.doUpdateFirmware(FirmwareFlasher.IMAGE_FILE, updateFirmware);
};
break; break;
case DFU_SWITCH: case DFU_SWITCH:
jobName = "DFU switch"; jobName = "DFU switch";