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

auto-sync

This commit is contained in:
rusEfi 2015-03-10 07:10:48 -05:00
parent f36bb2560c
commit 096b8172e3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java_console/build.xml
View File

@ -44,6 +44,8 @@
<fileset dir="ui/resources" includes="**/*.gif"/> <fileset dir="ui/resources" includes="**/*.gif"/>
<fileset dir="ui/resources" includes="**/*.png"/> <fileset dir="ui/resources" includes="**/*.png"/>
<fileset dir="romraider/resources" includes="**/*.*"/>
</copy> </copy>
<jar destfile="${jar_file}" basedir="build/classes"> <jar destfile="${jar_file}" basedir="build/classes">
<manifest> <manifest>
@ -52,6 +54,10 @@
<zipfileset src="lib/SteelSeries-3.9.30.jar" includes="**/*.class"/> <zipfileset src="lib/SteelSeries-3.9.30.jar" includes="**/*.class"/>
<zipfileset src="lib/trident-6.2.jar" includes="**/*.class"/> <zipfileset src="lib/trident-6.2.jar" includes="**/*.class"/>
<zipfileset src="lib/swing-layout-1.0.jar" includes="**/*.class"/>
<zipfileset src="lib/log4j.jar" includes="**/*.class"/>
<zipfileset src="lib/jep.jar" includes="**/*.class"/>
<zipfileset src="lib/jssc.jar" includes="**/*.class **/*.so **/*.dll **/*.jnilib"/> <zipfileset src="lib/jssc.jar" includes="**/*.class **/*.so **/*.dll **/*.jnilib"/>
<zipfileset src="lib/annotations.jar" includes="**/*.class"/> <zipfileset src="lib/annotations.jar" includes="**/*.class"/>

5
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -31,8 +31,8 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see com.rusefi.StartupFrame * @see com.rusefi.StartupFrame
*/ */
public class Launcher extends FrameHelper { public class Launcher extends FrameHelper {
public static final int CONSOLE_VERSION = 20150308; public static final int CONSOLE_VERSION = 20150310;
public static final boolean SHOW_STIMULATOR = true; public static final boolean SHOW_STIMULATOR = false;
public static final String TAB_INDEX = "main_tab"; public static final String TAB_INDEX = "main_tab";
private final String port; private final String port;
private final JTabbedPane tabbedPane = new JTabbedPane(); private final JTabbedPane tabbedPane = new JTabbedPane();
@ -62,6 +62,7 @@ public class Launcher extends FrameHelper {
// tabbedPane.addTab("ADC", new AdcPanel(new BooleanInputsModel()).createAdcPanel()); // tabbedPane.addTab("ADC", new AdcPanel(new BooleanInputsModel()).createAdcPanel());
if (SHOW_STIMULATOR && !LinkManager.isStimulationMode && !LinkManager.isLogViewerMode(port)) { if (SHOW_STIMULATOR && !LinkManager.isStimulationMode && !LinkManager.isLogViewerMode(port)) {
// todo: rethink this UI? special command line key to enable it?
EcuStimulator stimulator = EcuStimulator.getInstance(); EcuStimulator stimulator = EcuStimulator.getInstance();
tabbedPane.add("ECU stimulation", stimulator.getPanel()); tabbedPane.add("ECU stimulation", stimulator.getPanel());
} }