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

TS plugin progress

This commit is contained in:
rusefi 2020-06-04 23:32:52 -04:00
parent 1294171dfa
commit 11ce2df340
13 changed files with 108 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/build.xml
View File

@ -13,7 +13,7 @@
<target name="compile">
<mkdir dir="build/classes"/>
<javac debug="yes" destdir="build/classes"
classpath="../java_tools/configuration_definition/lib/snakeyaml.jar:lib/httpclient.jar:lib/jaxb-api.jar:lib/httpmime.jar:lib/httpcore.jar:lib/jSerialComm.jar:lib/jcip-annotations-1.0.jar:lib/jlatexmath-1.0.6.jar:lib/swing-layout-1.0.jar:lib/jep.jar:lib/log4j.jar:lib/junit.jar:lib/jssc.jar:lib/SteelSeries-3.9.30.jar:lib/annotations.jar:lib/miglayout-4.0.jar:lib/surfaceplotter-2.0.1.jar">
classpath="../java_tools/configuration_definition/lib/snakeyaml.jar:lib/jaxb-api.jar:lib/httpclient.jar:lib/httpmime.jar:lib/httpcore.jar:lib/jSerialComm.jar:lib/jcip-annotations-1.0.jar:lib/jlatexmath-1.0.6.jar:lib/swing-layout-1.0.jar:lib/jep.jar:lib/log4j.jar:lib/junit.jar:lib/jssc.jar:lib/SteelSeries-3.9.30.jar:lib/annotations.jar:lib/miglayout-4.0.jar:lib/surfaceplotter-2.0.1.jar">
<src path="autotest/src"/>
<src path="../java_tools/configuration_definition/src"/>
<src path="../java_tools/enum_to_string/src"/>

4
java_console/inifile/src/com/rusefi/tune/xml/Msq.java
View File

@ -3,6 +3,7 @@ package com.rusefi.tune.xml;
import com.opensr5.ConfigurationImage;
import com.opensr5.ini.IniFileModel;
import com.opensr5.ini.field.IniField;
import com.rusefi.ui.storage.PersistentConfiguration;
import com.rusefi.xml.XmlUtil;
import org.jetbrains.annotations.NotNull;
@ -10,11 +11,12 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.File;
import java.io.IOException;
@XmlRootElement
public class Msq {
public static final String outputXmlFileName = "output.msq";
public static final String outputXmlFileName = PersistentConfiguration.RUSEFI_SETTINGS_FOLDER + File.separator + "output.msq";
private final Page page = new Page();

0
java_console/shared_ui/src/com/rusefi/ui/storage/Node.java → java_console/inifile/src/com/rusefi/ui/storage/Node.java
View File

20
java_console/shared_ui/src/com/rusefi/ui/storage/PersistentConfiguration.java → java_console/inifile/src/com/rusefi/ui/storage/PersistentConfiguration.java
View File

@ -9,7 +9,8 @@ import java.util.Map;
public class PersistentConfiguration {
private static final PersistentConfiguration INSTANCE = new PersistentConfiguration();
private static final String RUSEFI_SETTINGS_FOLDER = System.getProperty("user.home") + File.separator + ".rusEFI";
public static final String RUSEFI_SETTINGS_FOLDER = System.getProperty("user.home") + File.separator + ".rusEFI";
private static boolean hookRegistered;
static {
new File(RUSEFI_SETTINGS_FOLDER).mkdirs();
@ -25,7 +26,22 @@ public class PersistentConfiguration {
}
private PersistentConfiguration() {
Runtime.getRuntime().addShutdownHook(new Thread(() -> getConfig().save()));
registerShutdownHook();
}
/**
* Does not work under TS plugin looks like TS does a violent System.exit?
*/
public static synchronized void registerShutdownHook() {
if (hookRegistered) {
hookRegistered = true;
return;
}
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
System.out.println("Shutdown hook...");
getConfig().save();
System.out.println("Shutdown hook!");
}));
}
@SuppressWarnings("unchecked")

2
java_console/shared_ui/shared_ui.iml
View File

@ -8,5 +8,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="annotations" level="project" />
<orderEntry type="module" module-name="inifile" />
<orderEntry type="library" name="httpclient" level="project" />
</component>
</module>

25
java_console/ui/src/com/rusefi/tools/online/Online.java → java_console/shared_ui/src/com/rusefi/tools/online/Online.java
View File

@ -1,5 +1,7 @@
package com.rusefi.tools.online;
import com.rusefi.tune.xml.Msq;
import com.rusefi.ui.AuthTokenPanel;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@ -10,8 +12,12 @@ import org.apache.http.entity.mime.content.StringBody;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
import javax.swing.*;
import javax.xml.bind.JAXBException;
import java.io.*;
import static com.rusefi.ui.AuthTokenPanel.TOKEN_WARNING;
public class Online {
private static final String url = "https://rusefi.com/online/upload.php";
@ -34,4 +40,23 @@ public class Online {
System.out.println(responseString);
}
public static void uploadTune(Msq tune, AuthTokenPanel authTokenPanel, JComponent parent) {
String authToken = authTokenPanel.getToken();
if (authToken.contains(TOKEN_WARNING)) {
JOptionPane.showMessageDialog(parent, "Does not work without auth token");
return;
}
new Thread(() -> doUpload(authToken, tune)).start();
}
private static void doUpload(String authToken, Msq tune) {
try {
tune.writeXmlFile(Msq.outputXmlFileName);
// todo: network upload should not happen on UI thread
upload(new File(Msq.outputXmlFileName), authToken);
} catch (JAXBException | IOException ex) {
throw new IllegalStateException(ex);
}
}
}

23
java_console/shared_ui/src/com/rusefi/ui/AuthTokenPanel.java
View File

@ -1,5 +1,9 @@
package com.rusefi.ui;
import com.rusefi.ui.storage.PersistentConfiguration;
import com.rusefi.ui.util.URLLabel;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
@ -9,6 +13,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
public class AuthTokenPanel {
public static final String TOKEN_WARNING = "Please copy token from your forum profile";
public static final String AUTH_TOKEN = "auth_token";
private static final String TOKEN_PROFILE_URL = "https://rusefi.com/forum/ucp.php?i=254";
private JPanel content = new JPanel(new FlowLayout(FlowLayout.LEFT));
private JTextField textField = new JTextField();
@ -16,24 +21,30 @@ public class AuthTokenPanel {
public AuthTokenPanel() {
textField.setPreferredSize(new Dimension(200, 24));
String authToken = getConfig().getRoot().getProperty(AUTH_TOKEN);
if (authToken.trim().isEmpty())
authToken = TOKEN_WARNING;
textField.setText(authToken);
String authToken = getAuthToken();
JButton save = new JButton("Save");
save.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
getConfig().getRoot().setProperty(AUTH_TOKEN, textField.getText());
PersistentConfiguration.getConfig().save();
}
});
content.add(textField);
content.add(save);
if (authToken.trim().isEmpty()) {
authToken = TOKEN_WARNING;
content.add(new URLLabel("Get it here", TOKEN_PROFILE_URL));
}
textField.setText(authToken);
}
@NotNull
public static String getAuthToken() {
return getConfig().getRoot().getProperty(AUTH_TOKEN);
}
public JPanel getContent() {

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

@ -16,6 +16,7 @@ import com.rusefi.ui.console.MainFrame;
import com.rusefi.ui.console.TabbedPanel;
import com.rusefi.ui.engine.EngineSnifferPanel;
import com.rusefi.ui.logview.LogViewer;
import com.rusefi.ui.storage.PersistentConfiguration;
import com.rusefi.ui.util.DefaultExceptionHandler;
import com.rusefi.ui.util.JustOneInstance;
import jssc.SerialPortList;
@ -185,6 +186,7 @@ public class Launcher extends rusEFIVersion {
System.out.println("rusEfi UI console " + CONSOLE_VERSION);
System.out.println("Compiled " + new Date(ConsoleTools.classBuildTimeMillis()));
System.out.println("\n\n");
PersistentConfiguration.registerShutdownHook();
if (ConsoleTools.runTool(args)) {
return;

20
java_console/ui/src/com/rusefi/ui/OnlineTab.java
View File

@ -7,15 +7,8 @@ import com.rusefi.ui.util.Misc;
import org.putgemin.VerticalFlowLayout;
import javax.swing.*;
import javax.xml.bind.JAXBException;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.io.File;
import java.io.IOException;
import static com.rusefi.ui.AuthTokenPanel.TOKEN_WARNING;
import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
public class OnlineTab {
@ -32,19 +25,8 @@ public class OnlineTab {
upload.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
String text = authTokenPanel.getToken();
if (text.contains(TOKEN_WARNING)) {
JOptionPane.showMessageDialog(content, "Does not work without auth token");
return;
}
Msq tune = Msq.toMsq(LinkManager.connector.getBinaryProtocol().getControllerConfiguration());
try {
tune.writeXmlFile(Msq.outputXmlFileName);
// todo: network upload should not happen on UI thread
Online.upload(new File(Msq.outputXmlFileName), text);
} catch (JAXBException | IOException ex) {
throw new IllegalStateException(ex);
}
Online.uploadTune(tune, authTokenPanel, content);
}
});
content.add(upload);

14
java_tools/ts_plugin/.idea/libraries/httpclient.xml Normal file
View File

@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="httpclient">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../java_console/lib/httpclient.jar!/" />
<root url="jar://$PROJECT_DIR$/../../java_console/lib/httpcore.jar!/" />
<root url="jar://$PROJECT_DIR$/../../java_console/lib/httpmime.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../java_console/lib/httpclient-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/../../java_console/lib/httpmime-javadoc.jar!/" />
</JAVADOC>
<SOURCES />
</library>
</component>

9
java_tools/ts_plugin/build.xml
View File

@ -12,7 +12,7 @@
<javac debug="yes"
destdir="build/classes"
classpath="${console_path}/lib/junit.jar:${console_path}/lib/annotations.jar:lib/TunerStudioPluginAPI.jar"
classpath="${console_path}/lib/junit.jar:${console_path}/lib/annotations.jar:lib/TunerStudioPluginAPI.jar:${console_path}/lib/httpclient.jar:${console_path}/lib/httpmime.jar:${console_path}/lib/httpcore.jar"
>
<src path="${console_path}/shared_ui/src"/>
<src path="${console_path}/inifile/src"/>
@ -31,7 +31,6 @@
<format property="TODAY" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
<jar destfile="${jar_file}" basedir="build/classes">
<manifest>
<attribute name="Built-Date" value="${TODAY}"/>
@ -42,10 +41,12 @@
<zipfileset src="../../java_console/lib/httpclient.jar" includes="**/*.class"/>
<zipfileset src="../../java_console/lib/httpcore.jar" includes="**/*.class"/>
<zipfileset src="../../java_console/lib/httpmime.jar" includes="**/*.class"/>
<zipfileset src="lib/commons-logging.jar" includes="**/*.class"/>
</jar>
</target>
<target name="local_install" depends="jar">
<copy file="${jar_file}" todir="${user.home}/.efianalytics/TunerStudio/plugins"/>
</target>
</project>

BIN
java_tools/ts_plugin/lib/commons-logging.jar Normal file
View File

Binary file not shown.

31
java_tools/ts_plugin/src/com/rusefi/TsPlugin.java
View File

@ -5,6 +5,7 @@ import com.efiAnalytics.plugin.ecu.ControllerAccess;
import com.efiAnalytics.plugin.ecu.ControllerException;
import com.efiAnalytics.plugin.ecu.ControllerParameter;
import com.efiAnalytics.plugin.ecu.servers.ControllerParameterServer;
import com.rusefi.tools.online.Online;
import com.rusefi.tune.xml.Constant;
import com.rusefi.tune.xml.Msq;
import com.rusefi.ui.AuthTokenPanel;
@ -14,10 +15,8 @@ import org.putgemin.VerticalFlowLayout;
import javax.swing.*;
import javax.xml.bind.JAXBException;
import java.io.File;
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
/**
* by the way TS installs stuff into %user%\.efianalytics\TunerStudio\plugins folder
@ -26,9 +25,22 @@ public class TsPlugin implements ApplicationPlugin {
private ControllerAccess controllerAccess;
private final JPanel content = new JPanel(new VerticalFlowLayout());
private final AuthTokenPanel tokenPanel = new AuthTokenPanel();
public TsPlugin() {
content.add(new JLabel("" + rusEFIVersion.CONSOLE_VERSION));
content.add(Misc.getRusEFI_online_manual());
content.add(new AuthTokenPanel().getContent());
content.add(tokenPanel.getContent());
JButton upload = new JButton("Upload");
upload.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Msq tune = writeCurrentTune(controllerAccess);
Online.uploadTune(tune, tokenPanel, content);
}
});
content.add(upload);
}
@Override
@ -55,11 +67,9 @@ public class TsPlugin implements ApplicationPlugin {
public void initialize(ControllerAccess controllerAccess) {
this.controllerAccess = controllerAccess;
printEcuConfigurationNames(controllerAccess);
uploadCurrentTune(controllerAccess);
}
private static String uploadCurrentTune(ControllerAccess controllerAccess) {
private static Msq writeCurrentTune(ControllerAccess controllerAccess) {
Msq msq = new Msq();
String configurationName = getConfigurationName();
ControllerParameterServer controllerParameterServer = controllerAccess.getControllerParameterServer();
@ -89,10 +99,9 @@ public class TsPlugin implements ApplicationPlugin {
msq.getPage().constant.add(new Constant(parameterName, cp.getUnits(), value));
}
Path tempDirWithPrefix = Files.createTempDirectory("rusefi_ts_plugin");
String fileName = tempDirWithPrefix + File.separator + "plugin.xml";
String fileName = Msq.outputXmlFileName;
msq.writeXmlFile(fileName);
return fileName;
return msq;
} catch (JAXBException | IOException | ControllerException e) {
System.out.println("Error writing XML: " + e);
return null;
@ -158,7 +167,7 @@ public class TsPlugin implements ApplicationPlugin {
@Override
public String getVersion() {
return "0.00000001";
return Integer.toString(rusEFIVersion.CONSOLE_VERSION);
}
@Override