From 68438213ae155fd589d1d20ab76ff514679d411b Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Mon, 23 Feb 2015 10:07:18 -0600
Subject: [PATCH] auto-sync

---
 firmware/controllers/algo/engine.cpp          |  1 +
 firmware/controllers/algo/engine.h            |  6 ++++
 firmware/controllers/settings.cpp             |  2 ++
 firmware/rusefi.cpp                           |  2 +-
 .../.idea/runConfigurations/RealHwTest.xml    | 28 +++++++++++++++++++
 .../autotest/src/com/rusefi/AutoTest.java     |  3 ++
 6 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 java_console/.idea/runConfigurations/RealHwTest.xml

diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index b8f2ef1c89..9974b6686e 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -59,6 +59,7 @@ Engine::Engine() {
 	engineCycleEventCount = 0;
 	stopEngineRequestTimeNt = 0;
 	isRunningPwmTest = false;
+	isTestMode = false;
 
 	addConfigurationListener(invokeEnginePreCalculate);
 }
diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index 0c24ce4e3f..012a447ca9 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -150,6 +150,12 @@ public:
 
 	bool_t isRunningPwmTest;
 
+	/**
+	 * are we running any kind of functional test? this affect
+	 * some areas
+	 */
+	bool_t isTestMode;
+
 	TriggerShape triggerShape;
 
 	/**
diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index a44e9700f9..19667fa36a 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -767,6 +767,8 @@ static void enableOrDisable(const char *param, bool isEnabled) {
 		boardConfiguration->isSdCardEnabled = isEnabled;
 	} else if (strEqualCaseInsensitive(param, "can")) {
 		engineConfiguration->isCanEnabled = isEnabled;
+	} else if (strEqualCaseInsensitive(param, "test_mode")) {
+		engine->isTestMode = isEnabled;
 	} else if (strEqualCaseInsensitive(param, "can_read")) {
 		engineConfiguration->canReadEnabled = isEnabled;
 	} else if (strEqualCaseInsensitive(param, "can_write")) {
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index 00b40441ee..0e9fb0aebf 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -278,5 +278,5 @@ int getRusEfiVersion(void) {
 		return 1; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE == 0)
 		return 1; // this is here to make the compiler happy about the unused array
-	return 20150222;
+	return 20150223;
 }
diff --git a/java_console/.idea/runConfigurations/RealHwTest.xml b/java_console/.idea/runConfigurations/RealHwTest.xml
new file mode 100644
index 0000000000..4090b1172b
--- /dev/null
+++ b/java_console/.idea/runConfigurations/RealHwTest.xml
@@ -0,0 +1,28 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RealHwTest" type="Application" factoryName="Application" nameIsGenerated="true">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+      <pattern>
+        <option name="PATTERN" value="com.rusefi.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <option name="MAIN_CLASS_NAME" value="com.rusefi.RealHwTest" />
+    <option name="VM_PARAMETERS" value="" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ENABLE_SWING_INSPECTOR" value="false" />
+    <option name="ENV_VARIABLES" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <module name="autotest" />
+    <envs />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
+    <ConfigurationWrapper RunnerId="Debug" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java
index 111ad4445f..5ff0b85942 100644
--- a/java_console/autotest/src/com/rusefi/AutoTest.java
+++ b/java_console/autotest/src/com/rusefi/AutoTest.java
@@ -300,6 +300,7 @@ public class AutoTest {
     }
 
     public static void main(String[] args) throws InterruptedException {
+        long start = System.currentTimeMillis();
         FileLog.SIMULATOR_CONSOLE.start();
         FileLog.MAIN.start();
 
@@ -318,6 +319,8 @@ public class AutoTest {
         FileLog.MAIN.logLine("*******************************************************************************");
         FileLog.MAIN.logLine("************************************  Looks good! *****************************");
         FileLog.MAIN.logLine("*******************************************************************************");
+        long time = (System.currentTimeMillis() - start) / 1000;
+        FileLog.MAIN.logLine("Done in " + time + "secs");
         System.exit(0); // this is a safer method eliminating the issue of non-daemon threads
     }
 }