From ae9ad1cab7b57d51c440c3cd0c1dd56a1d028410 Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Sat, 23 Jan 2016 12:02:44 -0500
Subject: [PATCH] auto-sync

---
 firmware/.cproject                | 39 -------------------------------
 firmware/controllers/settings.cpp |  6 ++++-
 2 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/firmware/.cproject b/firmware/.cproject
index 63802d8fb7..967ab67bd7 100644
--- a/firmware/.cproject
+++ b/firmware/.cproject
@@ -62,7 +62,6 @@
 									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@@ -75,16 +74,10 @@
 									<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/algo&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/ckp&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/adc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/system&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/stm32f4ems&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../splib&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_STM32F4_DISCOVERY&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/>
@@ -123,7 +116,6 @@
 									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@@ -136,16 +128,10 @@
 									<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/algo&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/ckp&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/adc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/system&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/stm32f4ems&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../splib&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_STM32F4_DISCOVERY&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/>
@@ -354,7 +340,6 @@
 									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@@ -367,16 +352,10 @@
 									<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/algo&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/ckp&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/adc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/system&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/stm32f1egt&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../splib&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_NUCLEO_F103RB&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/>
@@ -410,7 +389,6 @@
 									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@@ -425,7 +403,6 @@
 									<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/stm32f1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/algo&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
@@ -535,7 +512,6 @@
 									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@@ -550,7 +526,6 @@
 									<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/stm32f1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/algo&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
@@ -655,7 +630,6 @@
 									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@@ -668,16 +642,10 @@
 									<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/algo&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/ckp&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/adc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/system&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/stm32f4ems&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../splib&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_STM32F4_DISCOVERY&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/>
@@ -716,7 +684,6 @@
 									<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@@ -729,16 +696,10 @@
 									<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/algo&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/ckp&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../russianefi/adc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/system&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../config/stm32f4ems&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;../splib&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_STM32F4_DISCOVERY&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/>
diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index c9f44081f5..a7768a220b 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -192,6 +192,10 @@ const char* getConfigurationName(engine_type_e engineType) {
 		return "DODGE_RAM";
 	case MAZDA_626:
 		return "Mazda626";
+	case TOYOTA_JZS147:
+		return "TOYOTA_JZS147";
+	case LADA_KALINA:
+		return "LADA_KALINA";
 	default:
 		return "UnknownType";
 	}
@@ -508,7 +512,6 @@ static void setIndividualCoilsIgnition(void) {
 	setIgnitionMode((int)IM_INDIVIDUAL_COILS);
 }
 
-
 static void setTriggerType(int value) {
 	engineConfiguration->trigger.type = (trigger_type_e) value;
 	incrementGlobalConfigurationVersion();
@@ -516,6 +519,7 @@ static void setTriggerType(int value) {
 }
 
 static void setToothedWheel(int total, int skipped) {
+	engineConfiguration->trigger.type = TT_TOOTHED_WHEEL;
 	scheduleMsg(&logger, "toothed: total=%d/skipped=%d", total, skipped);
 	setToothedWheelConfiguration(&engine->triggerShape, total, skipped, engineConfiguration->operationMode);
 //	initializeTriggerShape(&logger, engineConfiguration, engineConfiguration2);