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

update firmware help button

This commit is contained in:
rusefi 2020-05-07 20:16:56 -04:00
parent cbd933edf6
commit 17f2ebe626
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -44,7 +44,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel * @see EngineSnifferPanel
*/ */
public class Launcher { public class Launcher {
public static final int CONSOLE_VERSION = 20200502; public static final int CONSOLE_VERSION = 20200507;
public static final String INI_FILE_PATH = System.getProperty("ini_file_path", ".."); public static final String INI_FILE_PATH = System.getProperty("ini_file_path", "..");
public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", ".."); public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", "..");
public static final String TOOLS_PATH = System.getProperty("tools_path", "."); public static final String TOOLS_PATH = System.getProperty("tools_path", ".");

10
java_console/ui/src/com/rusefi/maintenance/DfuFlasher.java
View File

@ -18,8 +18,6 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
/** /**
* @see FirmwareFlasher * @see FirmwareFlasher
@ -87,12 +85,8 @@ public class DfuFlasher {
// ugly temporary solution // ugly temporary solution
// see https://github.com/rusefi/rusefi/issues/1170 // see https://github.com/rusefi/rusefi/issues/1170
// see https://github.com/rusefi/rusefi/issues/1182 // see https://github.com/rusefi/rusefi/issues/1182
try { URLLabel.open(DFU_SETUP_EXE);
URLLabel.open(new URI(DFU_SETUP_EXE)); wnd.appendMsg("Please install DfuSe_Demo_V3.0.6_Setup.exe, power cycle your device and try again.");
wnd.appendMsg("Please install DfuSe_Demo_V3.0.6_Setup.exe, power cycle your device and try again.");
} catch (URISyntaxException e) {
throw new IllegalStateException(e);
}
} else { } else {
wnd.appendMsg(stdout.length() + " / " + errorResponse.length()); wnd.appendMsg(stdout.length() + " / " + errorResponse.length());
} }

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

@ -1,11 +1,13 @@
package com.rusefi.maintenance; package com.rusefi.maintenance;
import com.rusefi.ui.util.URLLabel;
import com.rusefi.ui.util.UiUtils; import com.rusefi.ui.util.UiUtils;
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.net.URI;
import java.util.Arrays; import java.util.Arrays;
import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
@ -16,6 +18,8 @@ public class ProgramSelector {
private static final String MANUAL_DFU = "Manual DFU"; private static final String MANUAL_DFU = "Manual DFU";
private static final String ST_LINK = "ST-LINK"; private static final String ST_LINK = "ST-LINK";
private static final String HELP = "https://github.com/rusefi/rusefi/wiki/HOWTO_Update_Firmeware";
private final JPanel controls = new JPanel(new FlowLayout()); private final JPanel controls = new JPanel(new FlowLayout());
private final JComboBox mode = new JComboBox(); private final JComboBox mode = new JComboBox();
@ -36,6 +40,9 @@ public class ProgramSelector {
JButton updateFirmware = new JButton("Update Firmware", JButton updateFirmware = new JButton("Update Firmware",
UiUtils.loadIcon("/com/rusefi/upload48.jpg")); UiUtils.loadIcon("/com/rusefi/upload48.jpg"));
controls.add(updateFirmware); controls.add(updateFirmware);
JButton updateHelp = new JButton("?");
updateHelp.addActionListener(e -> URLLabel.open(HELP));
controls.add(updateHelp);
updateFirmware.addActionListener(new ActionListener() { updateFirmware.addActionListener(new ActionListener() {
@Override @Override

8
java_console/ui/src/com/rusefi/ui/util/URLLabel.java
View File

@ -33,6 +33,14 @@ public class URLLabel extends JLabel {
return oURI; return oURI;
} }
public static void open(String url) {
try {
open(new URI(url));
} catch (URISyntaxException e) {
throw new IllegalStateException(e);
}
}
public void setup(String t, final URI u) { public void setup(String t, final URI u) {
setCursor(new Cursor(Cursor.HAND_CURSOR)); setCursor(new Cursor(Cursor.HAND_CURSOR));
text = t; text = t;