From cee8e7aef2b8c47bbc032546321c0706e84d6d77 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Sun, 22 Feb 2015 09:05:13 -0600
Subject: [PATCH] auto-sync

---
 .../config/engines/citroenBerlingoTU3JP.cpp   |  8 +++++-
 firmware/config/stm32f4ems/efifeatures.h      |  2 ++
 firmware/rusefi.cpp                           |  2 +-
 .../runConfigurations/Launcher_COM18.xml      | 27 +++++++++++++++++++
 .../runConfigurations/Launcher_COM37.xml      | 17 ++++++++++++
 .../runConfigurations/Launcher_COM41.xml      | 17 ++++++++++++
 .../.idea/runConfigurations/Launcher_COM7.xml |  3 ++-
 .../autotest/src/com/rusefi/AutoTest.java     | 14 +++++++---
 java_console/ui/src/com/rusefi/CmdLine.java   |  8 ++++++
 9 files changed, 92 insertions(+), 6 deletions(-)
 create mode 100644 java_console/.idea/runConfigurations/Launcher_COM18.xml
 create mode 100644 java_console/.idea/runConfigurations/Launcher_COM37.xml
 create mode 100644 java_console/.idea/runConfigurations/Launcher_COM41.xml
 create mode 100644 java_console/ui/src/com/rusefi/CmdLine.java

diff --git a/firmware/config/engines/citroenBerlingoTU3JP.cpp b/firmware/config/engines/citroenBerlingoTU3JP.cpp
index cd48bcf6f6..4df510bf39 100644
--- a/firmware/config/engines/citroenBerlingoTU3JP.cpp
+++ b/firmware/config/engines/citroenBerlingoTU3JP.cpp
@@ -1,7 +1,8 @@
 /**
  * @file	citroenBerlingoTU3JP.cpp
  *
- * CITROEN_TU3JP: engine_type 15
+ * CITROEN_TU3JP
+ * set_engine_type 15
  * Board pin out for Frankenstein
  *
  * This config overrides some values of the default configuration which is set by setDefaultConfiguration() method
@@ -53,6 +54,9 @@ static const ignition_table_t tps_advance_table = {
 {/*15 engineLoad=100.00*/ /*0 800.0*/+12.00, /*1 1213.0*/+13.20, /*2 1626.0*/+14.40, /*3 2040.0*/+15.60, /*4 2453.0*/+16.80, /*5 2866.0*/+18.00, /*6 3280.0*/+19.20, /*7 3693.0*/+20.40, /*8 4106.0*/+21.60, /*9 4520.0*/+22.80, /*10 4933.0*/+24.00, /*11 5346.0*/+25.20, /*12 5760.0*/+26.40, /*13 6173.0*/+27.60, /*14 6586.0*/+28.80, /*15 7000.0*/+30.00}
 };
 
+static const float rpmSteps[16] = {800, 1200, 1600, 2000, 2500, 2800,
+		3280, 3693.0, 4106.0, 4520.0, 4933.0, 5346.0, 5760.0, 6173.0, 6586.0, 7000.0};
+
 void setCitroenBerlingoTU3JPConfiguration(engine_configuration_s *engineConfiguration) {
 	board_configuration_s *boardConfiguration = &engineConfiguration->bc;
 
@@ -73,6 +77,8 @@ void setCitroenBerlingoTU3JPConfiguration(engine_configuration_s *engineConfigur
 	engineConfiguration->rpmHardLimit = 5000;
 	engineConfiguration->cranking.rpm = 600;
 
+	memcpy(engineConfiguration->ve2RpmBins, rpmSteps, sizeof(rpmSteps));
+
 	/**
 	* Cranking fuel setting
 	* TODO: they recomend using something like -40C for low point and +80C for high point
diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h
index 69a09d5af9..c934cd985b 100644
--- a/firmware/config/stm32f4ems/efifeatures.h
+++ b/firmware/config/stm32f4ems/efifeatures.h
@@ -18,6 +18,8 @@
 
 #define EFI_USE_CCM TRUE
 
+#define EFI_ENABLE_ASSERTS TRUE
+
 #ifndef EFI_ENABLE_ASSERTS
  #define EFI_ENABLE_ASSERTS FALSE
 #endif /* EFI_ENABLE_ASSERTS */
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index a13d2efc17..00b40441ee 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 20150220;
+	return 20150222;
 }
diff --git a/java_console/.idea/runConfigurations/Launcher_COM18.xml b/java_console/.idea/runConfigurations/Launcher_COM18.xml
new file mode 100644
index 0000000000..7e5b0b334b
--- /dev/null
+++ b/java_console/.idea/runConfigurations/Launcher_COM18.xml
@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Launcher COM18" type="Application" factoryName="Application">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <option name="MAIN_CLASS_NAME" value="com.rusefi.Launcher" />
+    <option name="VM_PARAMETERS" value="" />
+    <option name="PROGRAM_PARAMETERS" value="COM18" />
+    <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="ui" />
+    <envs />
+    <RunnerSettings RunnerId="Cover" />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
+    <RunnerSettings RunnerId="Run" />
+    <ConfigurationWrapper RunnerId="Cover" />
+    <ConfigurationWrapper RunnerId="Debug" />
+    <ConfigurationWrapper RunnerId="Run" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/java_console/.idea/runConfigurations/Launcher_COM37.xml b/java_console/.idea/runConfigurations/Launcher_COM37.xml
new file mode 100644
index 0000000000..c0ba9d1f11
--- /dev/null
+++ b/java_console/.idea/runConfigurations/Launcher_COM37.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Launcher COM37" type="Application" factoryName="Application">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <option name="MAIN_CLASS_NAME" value="com.rusefi.Launcher" />
+    <option name="VM_PARAMETERS" value="" />
+    <option name="PROGRAM_PARAMETERS" value="COM37" />
+    <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="ui" />
+    <envs />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/java_console/.idea/runConfigurations/Launcher_COM41.xml b/java_console/.idea/runConfigurations/Launcher_COM41.xml
new file mode 100644
index 0000000000..a0329d8ee2
--- /dev/null
+++ b/java_console/.idea/runConfigurations/Launcher_COM41.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Launcher COM41" type="Application" factoryName="Application">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <option name="MAIN_CLASS_NAME" value="com.rusefi.Launcher" />
+    <option name="VM_PARAMETERS" value="" />
+    <option name="PROGRAM_PARAMETERS" value="COM41" />
+    <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="ui" />
+    <envs />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/java_console/.idea/runConfigurations/Launcher_COM7.xml b/java_console/.idea/runConfigurations/Launcher_COM7.xml
index d4517f5de8..38c62d963d 100644
--- a/java_console/.idea/runConfigurations/Launcher_COM7.xml
+++ b/java_console/.idea/runConfigurations/Launcher_COM7.xml
@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Launcher COM7" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="com.irnems.Launcher" />
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <option name="MAIN_CLASS_NAME" value="com.rusefi.Launcher" />
     <option name="VM_PARAMETERS" value="" />
     <option name="PROGRAM_PARAMETERS" value="COM7" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java
index e554baacb1..9f56896a3b 100644
--- a/java_console/autotest/src/com/rusefi/AutoTest.java
+++ b/java_console/autotest/src/com/rusefi/AutoTest.java
@@ -18,6 +18,7 @@ import static com.rusefi.TestingUtils.*;
  */
 public class AutoTest {
     private static void mainTestBody() {
+        testCitroenBerlingo();
         testMazda626();
         test2003DodgeNeon();
         testFordAspire();
@@ -27,18 +28,25 @@ public class AutoTest {
         testFordFiesta();
     }
 
+    private static void testCitroenBerlingo() {
+        sendCommand("set_engine_type 15");
+        // time to change engine type
+        nextChart();
+        String msg = "Citroen";
+        // todo: add more content
+    }
+
     private static void testMazda626() {
         sendCommand("set_engine_type 28");
         WaveChart chart;
         // time to change engine type
         nextChart();
-        String msg = "Mazda 626";
+        String msg = "mazda 626 default cranking";
         IoUtil.changeRpm(200);
         chart = nextChart();
 
         double x = 275;
-        assertWave("aspire default cranking ", chart, WaveChart.SPARK_1, 0.1944, x, x + 180, x + 360, x + 540);
-
+        assertWave(msg, chart, WaveChart.SPARK_1, 0.1944, x, x + 180, x + 360, x + 540);
     }
 
     private static void test2003DodgeNeon() {
diff --git a/java_console/ui/src/com/rusefi/CmdLine.java b/java_console/ui/src/com/rusefi/CmdLine.java
new file mode 100644
index 0000000000..af80ba863f
--- /dev/null
+++ b/java_console/ui/src/com/rusefi/CmdLine.java
@@ -0,0 +1,8 @@
+package com.rusefi;
+
+/**
+ * (c) Andrey Belomutskiy 2013-2015
+ * 2/22/2015
+ */
+public class CmdLine {
+}