From 7bc9d94eb4260f83f3ef89243d029a5e1218aa29 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Mon, 23 Feb 2015 22:05:10 -0600
Subject: [PATCH] auto-sync

---
 firmware/compile.bat                               |  7 +++++--
 java_console/autotest/src/com/rusefi/AutoTest.java | 14 ++++++++------
 java_console/build.xml                             |  5 +++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/firmware/compile.bat b/firmware/compile.bat
index a51c1c2c04..3c6dde0455 100644
--- a/firmware/compile.bat
+++ b/firmware/compile.bat
@@ -41,8 +41,11 @@ arm-none-eabi-size  --format=berkeley "build\rusefi.elf"
 
 rem file, let's program the board right away
 cd build
-../flash_openocd
-exit
+call ../flash_openocd
+cd ..
+goto end_of_file
 
 :error
 echo Compilation failed
+
+:end_of_file
diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java
index d6fcccfa71..e73c1ed326 100644
--- a/java_console/autotest/src/com/rusefi/AutoTest.java
+++ b/java_console/autotest/src/com/rusefi/AutoTest.java
@@ -128,8 +128,8 @@ public class AutoTest {
     private static void test1995DodgeNeon() {
         setEngineType(2);
         WaveChart chart;
-        sendCommand("set_whole_fuel_map 3");
-        sendCommand("set_ignition_mode 1");
+        sendComplexCommand("set_whole_fuel_map 3");
+        sendComplexCommand("set_ignition_mode 1");
         /**
          * note that command order matters - RPM change resets wave chart
          */
@@ -150,8 +150,9 @@ public class AutoTest {
         assertWave(msg, chart, WaveChart.SPARK_3, 0.13333, x + 360);
 
         // switching to Speed Density
-        sendCommand("set_mock_map_voltage 1");
-        sendCommand("set_algorithm 3");
+        if (!TestingUtils.isRealHardware)
+            sendCommand("set_mock_map_voltage 1");
+        sendComplexCommand("set_algorithm 3");
         chart = nextChart();
         x = -70;
         assertWaveFall(msg, chart, WaveChart.INJECTOR_4, 0.463, x + 540);
@@ -183,7 +184,7 @@ public class AutoTest {
         assertWave(msg, chart, WaveChart.SPARK_1, 0.01666, x, x + 120, x + 240, x + 360, x + 480, x + 600);
 
         assertWaveNull(msg, chart, WaveChart.TRIGGER_2);
-        sendCommand("set_trigger_type 1"); // TT_FORD_ASPIRE
+        sendComplexCommand("set_trigger_type 1"); // TT_FORD_ASPIRE
         chart = nextChart();
         assertTrue(msg, chart.get(WaveChart.TRIGGER_2) != null);
     }
@@ -289,7 +290,8 @@ public class AutoTest {
         // switching to Speed Density
         if (!TestingUtils.isRealHardware)
             sendCommand("set_mock_maf_voltage 2");
-        sendCommand("set_mock_map_voltage 1");
+        if (!TestingUtils.isRealHardware)
+            sendCommand("set_mock_map_voltage 1");
         sendComplexCommand("set_algorithm 3");
         chart = nextChart();
         x = 8.88;
diff --git a/java_console/build.xml b/java_console/build.xml
index 9ac029d0a7..bc82c3b01a 100644
--- a/java_console/build.xml
+++ b/java_console/build.xml
@@ -75,6 +75,11 @@
 
     </target>
 
+    <target name="realtest" depends="jar">
+	<java classpath="${jar_file}" classname="com.rusefi.RealHwTest" failonerror="true"> 
+	</java>  
+
+    </target>
 
 
 </project>
\ No newline at end of file