mirror of https://github.com/rusefi/rusefi-1.git
auto-sync
This commit is contained in:
parent
02f8ceb6e0
commit
98fb256c8f
|
@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
|
||||||
* @see com.rusefi.StartupFrame
|
* @see com.rusefi.StartupFrame
|
||||||
*/
|
*/
|
||||||
public class Launcher {
|
public class Launcher {
|
||||||
public static final int CONSOLE_VERSION = 20150915;
|
public static final int CONSOLE_VERSION = 20150918;
|
||||||
public static final boolean SHOW_STIMULATOR = false;
|
public static final boolean SHOW_STIMULATOR = false;
|
||||||
private static final String TAB_INDEX = "main_tab";
|
private static final String TAB_INDEX = "main_tab";
|
||||||
protected static final String PORT_KEY = "port";
|
protected static final String PORT_KEY = "port";
|
||||||
|
@ -83,7 +83,7 @@ public class Launcher {
|
||||||
|
|
||||||
tabbedPane.addTab("Gauges", new GaugesPanel(getConfig().getRoot().getChild("gauges")).getContent());
|
tabbedPane.addTab("Gauges", new GaugesPanel(getConfig().getRoot().getChild("gauges")).getContent());
|
||||||
tabbedPane.addTab("Engine Sniffer", engineSnifferPanel.getPanel());
|
tabbedPane.addTab("Engine Sniffer", engineSnifferPanel.getPanel());
|
||||||
tabbedPane.addTab("Sensor Sniffer", new SensorSnifferPane().getPanel());
|
tabbedPane.addTab("Sensor Sniffer", new SensorSnifferPane(getConfig().getRoot().getChild("sensor_sniffer")).getPanel());
|
||||||
|
|
||||||
|
|
||||||
// tabbedPane.addTab("LE controls", new FlexibleControls().getPanel());
|
// tabbedPane.addTab("LE controls", new FlexibleControls().getPanel());
|
||||||
|
|
|
@ -4,10 +4,12 @@ import com.rusefi.config.Fields;
|
||||||
import com.rusefi.ui.RpmLabel;
|
import com.rusefi.ui.RpmLabel;
|
||||||
import com.rusefi.ui.RpmModel;
|
import com.rusefi.ui.RpmModel;
|
||||||
import com.rusefi.ui.config.EnumConfigField;
|
import com.rusefi.ui.config.EnumConfigField;
|
||||||
|
import com.rusefi.ui.storage.Node;
|
||||||
import com.rusefi.ui.util.UiUtils;
|
import com.rusefi.ui.util.UiUtils;
|
||||||
import com.rusefi.ui.engine.EngineSnifferPanel;
|
import com.rusefi.ui.engine.EngineSnifferPanel;
|
||||||
import com.rusefi.ui.config.ConfigField;
|
import com.rusefi.ui.config.ConfigField;
|
||||||
import com.rusefi.ui.util.URLLabel;
|
import com.rusefi.ui.util.URLLabel;
|
||||||
|
import com.rusefi.ui.widgets.AnyCommand;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
|
@ -39,7 +41,7 @@ public class SensorSnifferPane {
|
||||||
|
|
||||||
private boolean paused = false;
|
private boolean paused = false;
|
||||||
|
|
||||||
public SensorSnifferPane() {
|
public SensorSnifferPane(Node config) {
|
||||||
SensorSnifferCentral.addListener(new SensorSnifferCentral.AnalogChartListener() {
|
SensorSnifferCentral.addListener(new SensorSnifferCentral.AnalogChartListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onAnalogChart(final String message) {
|
public void onAnalogChart(final String message) {
|
||||||
|
@ -87,6 +89,8 @@ public class SensorSnifferPane {
|
||||||
upperPanel.add(pauseButton);
|
upperPanel.add(pauseButton);
|
||||||
upperPanel.add(new RpmLabel(2).getContent());
|
upperPanel.add(new RpmLabel(2).getContent());
|
||||||
|
|
||||||
|
upperPanel.add(new AnyCommand(config, true, false).getContent());
|
||||||
|
|
||||||
upperPanel.add(new URLLabel(EngineSnifferPanel.HELP_TEXT, HELP_URL));
|
upperPanel.add(new URLLabel(EngineSnifferPanel.HELP_TEXT, HELP_URL));
|
||||||
pauseButton.addActionListener(new
|
pauseButton.addActionListener(new
|
||||||
ActionListener() {
|
ActionListener() {
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package com.rusefi.test;
|
package com.rusefi.test;
|
||||||
|
|
||||||
import com.rusefi.SensorSnifferPane;
|
import com.rusefi.SensorSnifferPane;
|
||||||
|
import com.rusefi.ui.storage.Node;
|
||||||
import com.rusefi.ui.util.FrameHelper;
|
import com.rusefi.ui.util.FrameHelper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -8,8 +9,9 @@ import com.rusefi.ui.util.FrameHelper;
|
||||||
* (c) Andrey Belomutskiy
|
* (c) Andrey Belomutskiy
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class AnalogChartPanelSandbox extends FrameHelper {
|
public class SensorSnifferPaneSandbox extends FrameHelper {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
new EcuStimulatorSandbox().showFrame(new SensorSnifferPane().getPanel());
|
Node config = null;//getConfig().getRoot().getChild("sensor_sniffer");
|
||||||
|
new EcuStimulatorSandbox().showFrame(new SensorSnifferPane(config).getPanel());
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue