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

auto-sync

This commit is contained in:
rusEfi 2014-12-10 16:03:23 -06:00
parent 6911c654bc
commit ee7241a289
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java_console/ui/src/com/irnems/Launcher.java
View File

@ -19,7 +19,7 @@ import javax.swing.*;
* @see WavePanel * @see WavePanel
*/ */
public class Launcher extends FrameHelper { public class Launcher extends FrameHelper {
public static final int CONSOLE_VERSION = 20141204; public static final int CONSOLE_VERSION = 20141210;
public static final boolean SHOW_STIMULATOR = true; public static final boolean SHOW_STIMULATOR = true;
private final String port; private final String port;
@ -45,7 +45,7 @@ public class Launcher extends FrameHelper {
tabbedPane.addTab("LE controls", new FlexibleControls().getPanel()); tabbedPane.addTab("LE controls", new FlexibleControls().getPanel());
// tabbedPane.addTab("ADC", new AdcPanel(new BooleanInputsModel()).createAdcPanel()); // tabbedPane.addTab("ADC", new AdcPanel(new BooleanInputsModel()).createAdcPanel());
if (SHOW_STIMULATOR && !SimulatorHelper.RUNNING_SIMULATOR) { if (SHOW_STIMULATOR && !LinkManager.isStimulationMode) {
EcuStimulator stimulator = EcuStimulator.getInstance(); EcuStimulator stimulator = EcuStimulator.getInstance();
tabbedPane.add("ECU stimulation", stimulator.getPanel()); tabbedPane.add("ECU stimulation", stimulator.getPanel());
} }

4
java_console/ui/src/com/rusefi/SimulatorHelper.java
View File

@ -1,6 +1,7 @@
package com.rusefi; package com.rusefi;
import com.irnems.Launcher; import com.irnems.Launcher;
import com.rusefi.io.LinkManager;
import com.rusefi.io.tcp.TcpConnector; import com.rusefi.io.tcp.TcpConnector;
import javax.swing.*; import javax.swing.*;
@ -12,14 +13,13 @@ import java.io.IOException;
public class SimulatorHelper { public class SimulatorHelper {
public static final String BINARY = "rusefi_simulator.exe"; public static final String BINARY = "rusefi_simulator.exe";
private static Process process; private static Process process;
public static boolean RUNNING_SIMULATOR;
public static boolean isBinaryHere() { public static boolean isBinaryHere() {
return new File(BINARY).exists(); return new File(BINARY).exists();
} }
private static void startSimulator() { private static void startSimulator() {
RUNNING_SIMULATOR = true; LinkManager.isStimulationMode = true;
try { try {
process = Runtime.getRuntime().exec(BINARY); process = Runtime.getRuntime().exec(BINARY);
} catch (IOException e) { } catch (IOException e) {

3
java_console/ui/src/com/rusefi/ui/widgets/DetachedSensor.java
View File

@ -3,6 +3,7 @@ package com.rusefi.ui.widgets;
import com.irnems.core.Sensor; import com.irnems.core.Sensor;
import com.rusefi.SimulatorHelper; import com.rusefi.SimulatorHelper;
import com.rusefi.io.CommandQueue; import com.rusefi.io.CommandQueue;
import com.rusefi.io.LinkManager;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
@ -64,7 +65,7 @@ public class DetachedSensor {
} }
private boolean isMockable() { private boolean isMockable() {
return MOCKABLE.contains(sensor) && SimulatorHelper.RUNNING_SIMULATOR; return MOCKABLE.contains(sensor) && LinkManager.isStimulationMode;
} }
private static Component createMockVoltageSlider(final Sensor sensor) { private static Component createMockVoltageSlider(final Sensor sensor) {