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

proxy controls into TS plugin

This commit is contained in:
rusefi 2020-07-18 23:17:36 -04:00
parent 2a8945fb36
commit 80153e276b
7 changed files with 260 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/ui/src/test/java/com/rusefi/ServerTest.java
View File

@ -218,7 +218,7 @@ public class ServerTest {
System.out.println("Failed");
}
});
assertTrue("Connection established", connectionEstablishedCountDownLatch.await(30, TimeUnit.SECONDS));
assertTrue("Proxied ECU Connection established", connectionEstablishedCountDownLatch.await(30, TimeUnit.SECONDS));
BinaryProtocol clientStreamState = clientManager.getCurrentStreamState();
Objects.requireNonNull(clientStreamState, "clientStreamState");

12
java_tools/ts_plugin/src/com/rusefi/ts_plugin/BroadcastTab.java Normal file
View File

@ -0,0 +1,12 @@
package com.rusefi.ts_plugin;
import javax.swing.*;
import java.awt.*;
public class BroadcastTab {
private final Component content = new JPanel();
public Component getContent() {
return content;
}
}

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

@ -1,63 +1,17 @@
package com.rusefi.ts_plugin;
import com.efiAnalytics.plugin.ecu.ControllerAccess;
import com.efiAnalytics.plugin.ecu.ControllerException;
import com.efiAnalytics.plugin.ecu.ControllerParameterChangeListener;
import com.opensr5.ini.IniFileModel;
import com.opensr5.ini.field.IniField;
import com.rusefi.TsTuneReader;
import com.rusefi.autoupdate.AutoupdateUtil;
import com.rusefi.config.generated.Fields;
import com.rusefi.tools.online.Online;
import com.rusefi.tools.online.UploadResult;
import com.rusefi.ts_plugin.util.ManifestHelper;
import com.rusefi.tune.xml.Constant;
import com.rusefi.tune.xml.Msq;
import com.rusefi.ui.AuthTokenPanel;
import com.rusefi.ui.util.URLLabel;
import org.apache.http.concurrent.FutureCallback;
import org.putgemin.VerticalFlowLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.util.Date;
import java.util.Map;
import java.util.function.Supplier;
/**
* TsPlugin launcher creates an instance of this class via reflection.
*/
public class PluginEntry implements TsPluginBody {
// 2 seconds aggregation by default
private static final int AUTO_UPDATE_AGGREGATION = Integer.parseInt(System.getProperty("autoupload.aggregation", "2000"));
private static final String REO_URL = "https://rusefi.com/online/";
private final AuthTokenPanel tokenPanel = new AuthTokenPanel();
private final JComponent content = new JPanel(new VerticalFlowLayout());
private final UploadView uploadView = new UploadView();
private final JButton upload = new JButton("Upload Current Tune");
private final Supplier<ControllerAccess> controllerAccessSupplier;
private String currentConfiguration;
private UploaderStatus uploaderStatus = new UploaderStatus();
private final Timer timer = new Timer(AUTO_UPDATE_AGGREGATION, new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
// System.out.println("Timer! " + System.currentTimeMillis() + " " + timer + " " + e);
if (UploadView.isAutoUpload()) {
System.out.println(new Date() + ": enqueue tune");
UploadQueue.enqueue(controllerAccessSupplier.get(), currentConfiguration);
}
}
});
private final ControllerParameterChangeListener listener;
private final JTabbedPane tabbedPane = new JTabbedPane();
/**
* the real constructor - this one is invoked via reflection
@ -68,127 +22,14 @@ public class PluginEntry implements TsPluginBody {
public PluginEntry(Supplier<ControllerAccess> controllerAccessSupplier) {
System.out.println("PluginEntry init " + this);
timer.stop();
timer.setRepeats(false);
this.controllerAccessSupplier = controllerAccessSupplier;
UploadQueue.start();
listener = parameterName -> {
// System.out.println("Parameter value changed " + parameterName);
timer.restart();
};
upload.setBackground(new Color(0x90EE90));
new Thread(new Runnable() {
@Override
public void run() {
while (true) {
String configurationName = getConfigurationName();
if ((currentConfiguration == null && configurationName != null)
|| !currentConfiguration.equals(configurationName)) {
handleConfigurationChange(configurationName, controllerAccessSupplier.get());
}
UploadTab uploadTab = new UploadTab(controllerAccessSupplier);
BroadcastTab broadcastTab = new BroadcastTab();
RemoteTab remoteTab = new RemoteTab();
boolean isProjectActive = configurationName != null;
uploaderStatus.updateProjectStatus(configurationName, isProjectActive);
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
updateUploadEnabled();
}
});
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
}).start();
upload.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
if (!tokenPanel.hasToken()) {
tokenPanel.showError(content);
return;
}
String configurationName = getConfigurationName();
if (configurationName == null) {
JOptionPane.showMessageDialog(content, "No project opened");
return;
}
uploadView.uploadState.setVisible(true);
uploadView.uploadState.setText("Uploading...");
Msq tune = TuneUploder.writeCurrentTune(controllerAccessSupplier.get(), configurationName);
Online.uploadTune(tune, tokenPanel, content, new FutureCallback<UploadResult>() {
@Override
public void completed(UploadResult array) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
uploadView.setResult(array);
}
});
}
@Override
public void failed(Exception e) {
}
@Override
public void cancelled() {
}
});
}
});
content.add(new JLabel("Version " + ManifestHelper.getBuildTimestamp()));
// content.add(new JLabel("Active project: " + getConfigurationName()));
content.add(uploadView.getContent());
content.add(upload);
ImageIcon LOGO = AutoupdateUtil.loadIcon("/rusefi_online_color_300.png");
content.add(new JLabel(LOGO));
content.add(tokenPanel.getContent());
content.add(new URLLabel(REO_URL));
}
/**
* This method is invoked every time we defect a switch between projects
*/
private void handleConfigurationChange(String configurationName, ControllerAccess controllerAccess) {
uploaderStatus.readTuneState(configurationName);
if (configurationName != null) {
subscribeToUpdates(configurationName, controllerAccess);
}
updateUploadEnabled();
currentConfiguration = configurationName;
}
private void subscribeToUpdates(String configurationName, ControllerAccess controllerAccess) {
IniFileModel model = new IniFileModel().readIniFile(TsTuneReader.getProjectModeFileName(configurationName));
Map<String, IniField> allIniFields = model.allIniFields;
if (model.allIniFields == null)
return;
for (Map.Entry<String, IniField> field : allIniFields.entrySet()) {
boolean isOnlineTuneField = field.getValue().getOffset() >= Fields.engine_configuration_s_size;
if (!isOnlineTuneField) {
try {
controllerAccess.getControllerParameterServer().subscribe(configurationName, field.getKey(), listener);
} catch (ControllerException e) {
throw new IllegalStateException(e);
}
}
}
tabbedPane.addTab("Upload", uploadTab.getContent());
tabbedPane.addTab("Broadcast", broadcastTab.getContent());
tabbedPane.addTab("Remote ECU", remoteTab.getContent());
}
public static boolean isEmpty(Constant constant) {
@ -197,36 +38,19 @@ public class PluginEntry implements TsPluginBody {
return isEmpty(constant.getValue());
}
private void updateUploadEnabled() {
uploadView.update(uploaderStatus);
upload.setEnabled(uploaderStatus.isTuneOk() && uploaderStatus.isProjectIsOk());
}
private static boolean isEmpty(String value) {
return value == null || value.trim().length() == 0;
}
@Override
public JComponent getContent() {
return content;
return tabbedPane;
}
/*
public void close() {
PersistentConfiguration.getConfig().save();
}
*/
private String getConfigurationName() {
ControllerAccess controllerAccess = controllerAccessSupplier.get();
if (controllerAccess == null) {
System.out.println("No ControllerAccess");
return null;
}
String[] configurationNames = controllerAccess.getEcuConfigurationNames();
if (configurationNames.length == 0)
return null;
return configurationNames[0];
}
/**
* this method is invoked by refection

12
java_tools/ts_plugin/src/com/rusefi/ts_plugin/RemoteTab.java Normal file
View File

@ -0,0 +1,12 @@
package com.rusefi.ts_plugin;
import javax.swing.*;
import java.awt.*;
public class RemoteTab {
private final Component content = new JPanel();
public Component getContent() {
return content;
}
}

205
java_tools/ts_plugin/src/com/rusefi/ts_plugin/UploadTab.java Normal file
View File

@ -0,0 +1,205 @@
package com.rusefi.ts_plugin;
import com.efiAnalytics.plugin.ecu.ControllerAccess;
import com.efiAnalytics.plugin.ecu.ControllerException;
import com.efiAnalytics.plugin.ecu.ControllerParameterChangeListener;
import com.opensr5.ini.IniFileModel;
import com.opensr5.ini.field.IniField;
import com.rusefi.TsTuneReader;
import com.rusefi.autoupdate.AutoupdateUtil;
import com.rusefi.config.generated.Fields;
import com.rusefi.tools.online.Online;
import com.rusefi.tools.online.UploadResult;
import com.rusefi.ts_plugin.util.ManifestHelper;
import com.rusefi.tune.xml.Msq;
import com.rusefi.ui.AuthTokenPanel;
import com.rusefi.ui.util.URLLabel;
import org.apache.http.concurrent.FutureCallback;
import org.putgemin.VerticalFlowLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.util.Date;
import java.util.Map;
import java.util.function.Supplier;
public class UploadTab {
private final JComponent content = new JPanel(new VerticalFlowLayout());
// 2 seconds aggregation by default
private static final int AUTO_UPDATE_AGGREGATION = Integer.parseInt(System.getProperty("autoupload.aggregation", "2000"));
private static final String REO_URL = "https://rusefi.com/online/";
private final AuthTokenPanel tokenPanel = new AuthTokenPanel();
private final Supplier<ControllerAccess> controllerAccessSupplier;
private final UploadView uploadView = new UploadView();
private final JButton upload = new JButton("Upload Current Tune");
private String currentConfiguration;
private UploaderStatus uploaderStatus = new UploaderStatus();
private final Timer timer = new Timer(AUTO_UPDATE_AGGREGATION, new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
// System.out.println("Timer! " + System.currentTimeMillis() + " " + timer + " " + e);
if (UploadView.isAutoUpload()) {
System.out.println(new Date() + ": enqueue tune");
UploadQueue.enqueue(controllerAccessSupplier.get(), currentConfiguration);
}
}
});
private final ControllerParameterChangeListener listener;
public UploadTab(Supplier<ControllerAccess> controllerAccessSupplier) {
this.controllerAccessSupplier = controllerAccessSupplier;
timer.stop();
timer.setRepeats(false);
UploadQueue.start();
listener = parameterName -> {
// System.out.println("Parameter value changed " + parameterName);
timer.restart();
};
upload.setBackground(new Color(0x90EE90));
new Thread(new Runnable() {
@Override
public void run() {
while (true) {
String configurationName = getConfigurationName();
if ((currentConfiguration == null && configurationName != null)
|| !currentConfiguration.equals(configurationName)) {
handleConfigurationChange(configurationName, controllerAccessSupplier.get());
}
boolean isProjectActive = configurationName != null;
uploaderStatus.updateProjectStatus(configurationName, isProjectActive);
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
updateUploadEnabled();
}
});
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
}).start();
upload.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
if (!tokenPanel.hasToken()) {
tokenPanel.showError(content);
return;
}
String configurationName = getConfigurationName();
if (configurationName == null) {
JOptionPane.showMessageDialog(content, "No project opened");
return;
}
uploadView.uploadState.setVisible(true);
uploadView.uploadState.setText("Uploading...");
Msq tune = TuneUploder.writeCurrentTune(controllerAccessSupplier.get(), configurationName);
Online.uploadTune(tune, tokenPanel, content, new FutureCallback<UploadResult>() {
@Override
public void completed(UploadResult array) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
uploadView.setResult(array);
}
});
}
@Override
public void failed(Exception e) {
}
@Override
public void cancelled() {
}
});
}
});
content.add(new JLabel("Version " + ManifestHelper.getBuildTimestamp()));
// content.add(new JLabel("Active project: " + getConfigurationName()));
content.add(uploadView.getContent());
content.add(upload);
ImageIcon LOGO = AutoupdateUtil.loadIcon("/rusefi_online_color_300.png");
content.add(new JLabel(LOGO));
content.add(tokenPanel.getContent());
content.add(new URLLabel(REO_URL));
}
/**
* This method is invoked every time we defect a switch between projects
*/
private void handleConfigurationChange(String configurationName, ControllerAccess controllerAccess) {
uploaderStatus.readTuneState(configurationName);
if (configurationName != null) {
subscribeToUpdates(configurationName, controllerAccess);
}
updateUploadEnabled();
currentConfiguration = configurationName;
}
private void updateUploadEnabled() {
uploadView.update(uploaderStatus);
upload.setEnabled(uploaderStatus.isTuneOk() && uploaderStatus.isProjectIsOk());
}
private void subscribeToUpdates(String configurationName, ControllerAccess controllerAccess) {
IniFileModel model = new IniFileModel().readIniFile(TsTuneReader.getProjectModeFileName(configurationName));
Map<String, IniField> allIniFields = model.allIniFields;
if (model.allIniFields == null)
return;
for (Map.Entry<String, IniField> field : allIniFields.entrySet()) {
boolean isOnlineTuneField = field.getValue().getOffset() >= Fields.engine_configuration_s_size;
if (!isOnlineTuneField) {
try {
controllerAccess.getControllerParameterServer().subscribe(configurationName, field.getKey(), listener);
} catch (ControllerException e) {
throw new IllegalStateException(e);
}
}
}
}
private String getConfigurationName() {
ControllerAccess controllerAccess = controllerAccessSupplier.get();
if (controllerAccess == null) {
System.out.println("No ControllerAccess");
return null;
}
String[] configurationNames = controllerAccess.getEcuConfigurationNames();
if (configurationNames.length == 0)
return null;
return configurationNames[0];
}
public JComponent getContent() {
return content;
}
}

13
java_tools/ts_plugin_launcher/.idea/libraries/jSerialComm.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="jSerialComm">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../java_console/lib/jSerialComm.jar!/" />
<root url="jar://$PROJECT_DIR$/../../java_console/lib/jSerialComm-src.zip!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../java_console/lib/jSerialComm-src.zip!/jSerialComm-2.5.3/src/main/java" />
<root url="jar://$PROJECT_DIR$/../../java_console/lib/jSerialComm-src.zip!/jSerialComm-2.5.3/src/test/java" />
</SOURCES>
</library>
</component>

9
java_tools/ts_plugin_launcher/.idea/libraries/jcip_annotations.xml Normal file
View File

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="jcip-annotations">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../java_console/lib/jcip-annotations-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>