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

ETB quality instrumentation #494

This commit is contained in:
rusefi 2019-04-24 16:55:31 -04:00
parent e160077778
commit 08b2c99c3e
4 changed files with 104 additions and 11 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

@ -45,7 +45,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20190423;
public static final int CONSOLE_VERSION = 20190424;
public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port";

3
java_console/ui/src/com/rusefi/ui/etb/CalibrationPanel.java
View File

@ -5,6 +5,9 @@ import org.putgemin.VerticalFlowLayout;
import javax.swing.*;
/**
* (c) Andrey Belomutskiy
*/
public class CalibrationPanel {
private final JPanel content = new JPanel(new VerticalFlowLayout());

11
java_console/ui/src/com/rusefi/ui/etb/CommandsPanel.java
View File

@ -1,7 +1,6 @@
package com.rusefi.ui.etb;
import com.rusefi.ETBPane;
import com.rusefi.io.CommandQueue;
import com.rusefi.ui.storage.Node;
import com.rusefi.ui.util.UiUtils;
import com.rusefi.ui.widgets.AnyCommand;
@ -11,17 +10,9 @@ import javax.swing.*;
public class CommandsPanel {
private final JPanel content = new JPanel(new VerticalFlowLayout());
private final JLabel currentOverride = new JLabel();
public CommandsPanel() {
content.add(currentOverride);
CommandQueue.getInstance().addListener(command -> {
if (command.startsWith(ETBPane.SET_ETB)) {
command = command.substring(ETBPane.SET_ETB.length());
String finalCommand = command;
SwingUtilities.invokeLater(() -> currentOverride.setText("PWM override " + finalCommand));
}
});
content.add(new DirectDrivePanel().getContent());
JPanel spotsPane = new JPanel(new VerticalFlowLayout());
spotsPane.setBorder(BorderFactory.createTitledBorder("Magic Spots"));

99
java_console/ui/src/com/rusefi/ui/etb/DirectDrivePanel.java Normal file
View File

@ -0,0 +1,99 @@
package com.rusefi.ui.etb;
import com.rusefi.ETBPane;
import com.rusefi.io.CommandQueue;
import org.putgemin.VerticalFlowLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
/**
* Little panel to drive ETB duty cycle directly
*
* (c) Andrey Belomutskiy
* @see ETBPane#SET_ETB
*/
public class DirectDrivePanel {
private final JPanel content = new JPanel(new BorderLayout());
private final JLabel currentOverride = new JLabel("NaN");
private final JTextArea increment = new JTextArea("0.5");
private final JButton reset = new JButton("Cancel Direct Drive");
private double directDriverValue;
public DirectDrivePanel() {
content.setBorder(BorderFactory.createTitledBorder("Direct Drive"));
CommandQueue.getInstance().addListener(command -> {
if (command.startsWith(ETBPane.SET_ETB)) {
command = command.substring(ETBPane.SET_ETB.length());
directDriverValue = parseDouble(command, Double.NaN);
SwingUtilities.invokeLater(() -> currentOverride.setText("PWM override " + directDriverValue));
reset.setEnabled(!Double.isNaN(directDriverValue));
}
});
JPanel upDownPanel = new JPanel(new GridLayout(2, 1));
JButton more = new JButton("More");
more.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
double newValue = getCurrent() + getIncrement();
CommandQueue.getInstance().write(ETBPane.SET_ETB + newValue);
}
});
upDownPanel.add(more);
JButton less = new JButton("Less");
upDownPanel.add(less);
less.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
double newValue = getCurrent() - getIncrement();
CommandQueue.getInstance().write(ETBPane.SET_ETB + newValue);
}
});
JPanel leftPanel = new JPanel(new VerticalFlowLayout());
reset.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
CommandQueue.getInstance().write(ETBPane.SET_ETB + "NaN");
}
});
leftPanel.add(reset);
leftPanel.add(currentOverride);
leftPanel.add(new JLabel("Increment:"));
leftPanel.add(increment);
content.add(leftPanel, BorderLayout.CENTER);
content.add(upDownPanel, BorderLayout.EAST);
}
private double parseDouble(String text, double defaultValue) {
try {
return Double.parseDouble(text);
} catch (NumberFormatException e) {
return defaultValue;
}
}
private double getIncrement() {
try {
double value = Double.parseDouble(increment.getText());
return Double.isNaN(value) ? 0.5 : value;
} catch (NumberFormatException e) {
increment.setText("0.5");
return 0.5;
}
}
private double getCurrent() {
return Double.isNaN(directDriverValue) ? 0 : directDriverValue;
}
public JPanel getContent() {
return content;
}
}