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

check if tune file found, tune summary

This commit is contained in:
rusefi 2020-06-23 21:06:34 -04:00
parent e42c578415
commit 853575c058
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java_tools/ts_plugin/src/com/rusefi/TsTuneReader.java
View File

@ -9,24 +9,20 @@ import javax.swing.filechooser.FileSystemView;
import java.io.File;
public class TsTuneReader {
public static void main(String[] args) {
public static void main(String[] args) throws Exception {
String ecuName = "dev";
Msq tune = readTsTune(ecuName);
System.out.println(tune);
}
public static Msq readTsTune(String ecuName) {
public static Msq readTsTune(String ecuName) throws Exception {
String fileName = getTsTuneFileName(ecuName);
try {
return XmlUtil.readModel(Msq.class, fileName);
} catch (Exception e) {
throw new IllegalStateException(e);
}
return XmlUtil.readModel(Msq.class, fileName);
}
@NotNull
private static String getTsTuneFileName(String ecuName) {
public static String getTsTuneFileName(String ecuName) {
JFileChooser fr = new JFileChooser();
FileSystemView fw = fr.getFileSystemView();
File defaultDirectory = fw.getDefaultDirectory();

28
java_tools/ts_plugin/src/com/rusefi/ts_plugin/PluginEntry.java
View File

@ -1,6 +1,7 @@
package com.rusefi.ts_plugin;
import com.efiAnalytics.plugin.ecu.ControllerAccess;
import com.rusefi.TsTuneReader;
import com.rusefi.autoupdate.AutoupdateUtil;
import com.rusefi.tools.online.Online;
import com.rusefi.tune.xml.Constant;
@ -16,6 +17,7 @@ import org.putgemin.VerticalFlowLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.Map;
@ -30,14 +32,15 @@ public class PluginEntry implements TsPluginBody {
private static final String BUILT_DATE = "Built-Date";
private static final String BUILT_TIMESTAMP = "Built-Timestamp";
public static final String REO = "https://rusefi.com/online/";
private static final String NO_PROJECT = "Please open project";
private final AuthTokenPanel tokenPanel = new AuthTokenPanel();
private final JComponent content = new JPanel(new VerticalFlowLayout());
private final ImageIcon LOGO = AutoupdateUtil.loadIcon("/rusefi_online_color_300.png");
private final JButton upload = new JButton("Upload Current Tune");
private final JLabel uploadState = new JLabel();
private final JLabel projectWarning = new JLabel("Please open project");
private final JLabel tuneWarning = new JLabel();
private final JLabel projectWarning = new JLabel(NO_PROJECT);
private final JLabel tuneInfo = new JLabel();
private final Supplier<ControllerAccess> controllerAccessSupplier;
private String currentConfiguration;
@ -69,8 +72,16 @@ public class PluginEntry implements TsPluginBody {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
projectWarning.setVisible(!isProjectActive);
projectIsOk = isProjectActive;
if (!isProjectActive) {
projectWarning.setText(NO_PROJECT);
projectIsOk = false;
} else if (!new File(TsTuneReader.getTsTuneFileName(configurationName)).exists()) {
projectWarning.setText("Tune not found " + configurationName);
projectIsOk = false;
} else {
projectIsOk = true;
}
projectWarning.setVisible(!projectIsOk);
updateUploadEnabled();
}
});
@ -127,7 +138,7 @@ public class PluginEntry implements TsPluginBody {
uploadState.setVisible(false);
content.add(projectWarning);
content.add(tuneWarning);
content.add(tuneInfo);
content.add(upload);
content.add(uploadState);
content.add(new JLabel(LOGO));
@ -151,13 +162,12 @@ public class PluginEntry implements TsPluginBody {
warning += " vehicle name";
}
if (warning.isEmpty()) {
tuneWarning.setVisible(false);
tuneInfo.setText(engineMake.getValue() + " " + engineCode.getValue() + " " + vehicleName.getValue());
tuneIsOk = true;
updateUploadEnabled();
} else {
tuneWarning.setText("<html>Please set " + warning + " on Base Settings tab<br>and reopen Project");
tuneWarning.setForeground(Color.red);
tuneWarning.setVisible(true);
tuneInfo.setText("<html>Please set " + warning + " on Base Settings tab<br>and reopen Project");
tuneInfo.setForeground(Color.red);
tuneIsOk = false;
updateUploadEnabled();
}

7
java_tools/ts_plugin/src/com/rusefi/ts_plugin/TuneUploder.java
View File

@ -42,7 +42,12 @@ public class TuneUploder {
static Map<String, Constant> getFileSystemValues(String configurationName) {
if (configurationName == null)
return Collections.emptyMap();
Msq tsTune = TsTuneReader.readTsTune(configurationName);
Msq tsTune;
try {
tsTune = TsTuneReader.readTsTune(configurationName);
} catch (Exception e) {
return Collections.emptyMap();
}
Map<String, Constant> byName = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
for (Constant c : tsTune.findPage().constant) {
byName.put(c.getName(), c);