diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index a620d5a274..54d27b988e 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see com.rusefi.StartupFrame */ public class Launcher { - public static final int CONSOLE_VERSION = 20150915; + public static final int CONSOLE_VERSION = 20150918; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; 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("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()); diff --git a/java_console/ui/src/com/rusefi/SensorSnifferPane.java b/java_console/ui/src/com/rusefi/SensorSnifferPane.java index 79404424fd..beb44ef41e 100644 --- a/java_console/ui/src/com/rusefi/SensorSnifferPane.java +++ b/java_console/ui/src/com/rusefi/SensorSnifferPane.java @@ -4,10 +4,12 @@ import com.rusefi.config.Fields; import com.rusefi.ui.RpmLabel; import com.rusefi.ui.RpmModel; import com.rusefi.ui.config.EnumConfigField; +import com.rusefi.ui.storage.Node; import com.rusefi.ui.util.UiUtils; import com.rusefi.ui.engine.EngineSnifferPanel; import com.rusefi.ui.config.ConfigField; import com.rusefi.ui.util.URLLabel; +import com.rusefi.ui.widgets.AnyCommand; import javax.swing.*; import java.awt.*; @@ -39,7 +41,7 @@ public class SensorSnifferPane { private boolean paused = false; - public SensorSnifferPane() { + public SensorSnifferPane(Node config) { SensorSnifferCentral.addListener(new SensorSnifferCentral.AnalogChartListener() { @Override public void onAnalogChart(final String message) { @@ -87,6 +89,8 @@ public class SensorSnifferPane { upperPanel.add(pauseButton); upperPanel.add(new RpmLabel(2).getContent()); + upperPanel.add(new AnyCommand(config, true, false).getContent()); + upperPanel.add(new URLLabel(EngineSnifferPanel.HELP_TEXT, HELP_URL)); pauseButton.addActionListener(new ActionListener() { diff --git a/java_console/ui/src/com/rusefi/test/AnalogChartPanelSandbox.java b/java_console/ui/src/com/rusefi/test/SensorSnifferPaneSandbox.java similarity index 57% rename from java_console/ui/src/com/rusefi/test/AnalogChartPanelSandbox.java rename to java_console/ui/src/com/rusefi/test/SensorSnifferPaneSandbox.java index ce5bd022dd..1cfbdf6248 100644 --- a/java_console/ui/src/com/rusefi/test/AnalogChartPanelSandbox.java +++ b/java_console/ui/src/com/rusefi/test/SensorSnifferPaneSandbox.java @@ -1,6 +1,7 @@ package com.rusefi.test; import com.rusefi.SensorSnifferPane; +import com.rusefi.ui.storage.Node; import com.rusefi.ui.util.FrameHelper; /** @@ -8,8 +9,9 @@ import com.rusefi.ui.util.FrameHelper; * (c) Andrey Belomutskiy */ -public class AnalogChartPanelSandbox extends FrameHelper { +public class SensorSnifferPaneSandbox extends FrameHelper { 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()); } } \ No newline at end of file