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

Merge remote-tracking branch 'origin/master' into master 

# Conflicts:
#	firmware/config/engines/rover_v8.cpp
This commit is contained in:
rusefillc 2020-12-20 17:19:15 -05:00
parent 038eb00207 58ddfea3df
commit e4637ea114
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/models/src/main/java/com/rusefi/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 class rusEFIVersion { public class rusEFIVersion {
public static final int CONSOLE_VERSION = 20201205; public static final int CONSOLE_VERSION = 20201220;
public static AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A"); public static AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
public static long classBuildTimeMillis() { public static long classBuildTimeMillis() {

6
java_console/ui/src/main/java/com/rusefi/StartupFrame.java
View File

@ -1,6 +1,7 @@
package com.rusefi; package com.rusefi;
import com.rusefi.autodetect.PortDetector; import com.rusefi.autodetect.PortDetector;
import com.rusefi.autoupdate.Autoupdate;
import com.rusefi.autoupdate.AutoupdateUtil; import com.rusefi.autoupdate.AutoupdateUtil;
import com.rusefi.io.LinkManager; import com.rusefi.io.LinkManager;
import com.rusefi.io.serial.BaudRateHolder; import com.rusefi.io.serial.BaudRateHolder;
@ -24,6 +25,7 @@ import java.util.List;
import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
import static com.rusefi.ui.util.UiUtils.getAllComponents; import static com.rusefi.ui.util.UiUtils.getAllComponents;
import static com.rusefi.ui.util.UiUtils.setToolTip; import static com.rusefi.ui.util.UiUtils.setToolTip;
import static java.awt.image.ImageObserver.ABORT;
import static javax.swing.JOptionPane.YES_NO_OPTION; import static javax.swing.JOptionPane.YES_NO_OPTION;
/** /**
@ -68,7 +70,9 @@ public class StartupFrame {
public StartupFrame() { public StartupFrame() {
// AudioPlayback.start(); // AudioPlayback.start();
frame = new JFrame("rusEFI console version " + Launcher.CONSOLE_VERSION); String title = "rusEFI console version " + Launcher.CONSOLE_VERSION;
String bundleName = Autoupdate.readBundleFullName();
frame = new JFrame(title + " " + (bundleName != null ? bundleName : "Unknown bundle"));
frame.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); frame.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
frame.addWindowListener(new WindowAdapter() { frame.addWindowListener(new WindowAdapter() {
@Override @Override