From 56a21e9827b2eb32e23e9a56b5a44b4dbbf7fd38 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Tue, 24 Feb 2015 08:05:15 -0600
Subject: [PATCH] auto-sync

---
 firmware/config/engines/custom_engine.cpp          | 5 +++++
 firmware/config/engines/mazda_626.cpp              | 6 +++---
 firmware/controllers/algo/rusefi_enums.h           | 3 +++
 firmware/svnversion.h                              | 4 ++--
 java_console/autotest/src/com/rusefi/AutoTest.java | 2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp
index a1a786cfa0..7866b0c415 100644
--- a/firmware/config/engines/custom_engine.cpp
+++ b/firmware/config/engines/custom_engine.cpp
@@ -94,6 +94,11 @@ void setCustomEngineConfiguration(engine_configuration_s *engineConfiguration) {
 
 	// todo: 8.2 or 10k?
 	engineConfiguration->vbattDividerCoeff = ((float) (10 + 33)) / 10 * 2;
+
+	engineConfiguration->tpsAdcChannel = EFI_ADC_NONE;
+	engineConfiguration->cltAdcChannel = EFI_ADC_12;
+	engineConfiguration->iatAdcChannel = EFI_ADC_11;
+
 }
 
 #endif /* CONFIG_ENGINES_CUSTOM_ENGINE_CPP_ */
diff --git a/firmware/config/engines/mazda_626.cpp b/firmware/config/engines/mazda_626.cpp
index 171a5f6631..c3e1653be5 100644
--- a/firmware/config/engines/mazda_626.cpp
+++ b/firmware/config/engines/mazda_626.cpp
@@ -45,13 +45,13 @@ void setMazda626EngineConfiguration(engine_configuration_s *engineConfiguration)
 
 	commonFrankensoAnalogInputs(engineConfiguration);
 	engineConfiguration->hasTpsSensor = false;
-	engineConfiguration->tpsAdcChannel = EFI_ADC_NONE;
 //	engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;
 	engineConfiguration->mafAdcChannel = EFI_ADC_0;
-	engineConfiguration->cltAdcChannel = EFI_ADC_12;
-	engineConfiguration->iatAdcChannel = EFI_ADC_11;
 
 	// todo: 8.2 or 10k?
 	engineConfiguration->vbattDividerCoeff = ((float) (10 + 33)) / 10 * 2;
 
+
+// todo	engineConfiguration->afr.hwChannel = EFI_ADC_3;
+	initEgoSensor(&engineConfiguration->afr, ES_Innovate_MTX_L);
 }
diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index 8771d9e06c..3a3f01d9d4 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -359,6 +359,9 @@ typedef enum {
 
 typedef enum {
 	ES_BPSX_D1 = 0,
+	/**
+	 * same as innovate LC2
+	 */
 	ES_Innovate_MTX_L = 1,
 	ES_14Point7_Free = 2,
 
diff --git a/firmware/svnversion.h b/firmware/svnversion.h
index 98415814ac..0834c5a1e8 100644
--- a/firmware/svnversion.h
+++ b/firmware/svnversion.h
@@ -1,5 +1,5 @@
 // This file was generated by Version2Header
-// Tue Feb 24 07:45:52 EST 2015
+// Tue Feb 24 07:56:32 EST 2015
 #ifndef VCS_VERSION
-#define VCS_VERSION "7025"
+#define VCS_VERSION "7040"
 #endif
diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java
index e73c1ed326..4180976e61 100644
--- a/java_console/autotest/src/com/rusefi/AutoTest.java
+++ b/java_console/autotest/src/com/rusefi/AutoTest.java
@@ -48,7 +48,7 @@ public class AutoTest {
         // todo: add more content
     }
 
-    private static void setEngineType(int type) {
+    static void setEngineType(int type) {
         currentEngineType = type;
         sendCommand("set_engine_type " + type, COMPLEX_COMMAND_RETRY, 600);
         sleep(10);