From 4a75ca50f6d063c662e75459c01d8604c69ed23b Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Thu, 9 Apr 2015 21:13:56 -0500
Subject: [PATCH] auto-sync

---
 firmware/config/engines/engines.mk                |  4 +++-
 firmware/config/engines/gm_2_2.cpp                | 14 ++++++++++++++
 firmware/config/engines/gm_2_2.h                  | 15 +++++++++++++++
 .../controllers/algo/auto_generated_enums.cpp     |  2 ++
 .../controllers/algo/engine_configuration.cpp     |  4 ++++
 firmware/controllers/algo/rusefi_enums.h          |  4 +++-
 firmware/controllers/settings.cpp                 |  2 ++
 firmware/rusefi.cpp                               |  2 +-
 8 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 firmware/config/engines/gm_2_2.cpp
 create mode 100644 firmware/config/engines/gm_2_2.h

diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk
index 8594e03483..f7b445e800 100644
--- a/firmware/config/engines/engines.mk
+++ b/firmware/config/engines/engines.mk
@@ -24,4 +24,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \
 	$(PROJECT_DIR)/config/engines/saturn_ion.cpp \
 	$(PROJECT_DIR)/config/engines/sachs.cpp \
 	$(PROJECT_DIR)/config/engines/test_engine.cpp \
-	$(PROJECT_DIR)/config/engines/mitsubishi.cpp
\ No newline at end of file
+	$(PROJECT_DIR)/config/engines/mitsubishi.cpp \
+	$(PROJECT_DIR)/config/engines/gm_2_2.cpp
+	
\ No newline at end of file
diff --git a/firmware/config/engines/gm_2_2.cpp b/firmware/config/engines/gm_2_2.cpp
new file mode 100644
index 0000000000..a6b732def7
--- /dev/null
+++ b/firmware/config/engines/gm_2_2.cpp
@@ -0,0 +1,14 @@
+/*
+ * @file gm_2_2.cpp
+ *
+ * @date Apr 9, 2015
+ * @author Andrey Belomutskiy, (c) 2012-2015
+ */
+
+#include "global.h"
+#include "gm_2_2.h"
+
+void setGm2_2(DECLARE_ENGINE_PARAMETER_F) {
+
+}
+
diff --git a/firmware/config/engines/gm_2_2.h b/firmware/config/engines/gm_2_2.h
new file mode 100644
index 0000000000..7abfde296e
--- /dev/null
+++ b/firmware/config/engines/gm_2_2.h
@@ -0,0 +1,15 @@
+/*
+ * @file gm_2_2.h
+ *
+ * @date Apr 9, 2015
+ * @author Andrey Belomutskiy, (c) 2012-2015
+ */
+
+#ifndef CONFIG_ENGINES_GM_2_2_H_
+#define CONFIG_ENGINES_GM_2_2_H_
+
+#include "engine.h"
+
+void setGm2_2(DECLARE_ENGINE_PARAMETER_F);
+
+#endif /* CONFIG_ENGINES_GM_2_2_H_ */
diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp
index 876e35caa2..b16c72a8ba 100644
--- a/firmware/controllers/algo/auto_generated_enums.cpp
+++ b/firmware/controllers/algo/auto_generated_enums.cpp
@@ -16,6 +16,8 @@ case AUDI_AAN:
   return "AUDI_AAN";
 case SACHS:
   return "SACHS";
+case GM_2_2:
+  return "GM_2_2";
 case BMW_E34:
   return "BMW_E34";
 case CITROEN_TU3JP:
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index 5bfa04cb86..949bc9846d 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -54,6 +54,7 @@
 #include "subaru.h"
 #include "test_engine.h"
 #include "sachs.h"
+#include "gm_2_2.h"
 
 EXTERN_ENGINE;
 
@@ -705,6 +706,9 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
 	case BMW_E34:
 		setBmwE34(PASS_ENGINE_PARAMETER_F);
 		break;
+	case GM_2_2:
+		setGm2_2(PASS_ENGINE_PARAMETER_F);
+		break;
 	case TEST_ENGINE:
 		setTestEngineConfiguration(PASS_ENGINE_PARAMETER_F);
 		break;
diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index 1888c41223..0d96b89dca 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -95,7 +95,9 @@ typedef enum {
 
 	SACHS = 29,
 
-	ET_UNUSED = 30,
+	GM_2_2 = 30,
+
+	ET_UNUSED = 31,
 
 	Force_4b_engine_type = ENUM_32_BITS,
 } engine_type_e;
diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index 85b8f50dc7..c46912e41a 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -172,6 +172,8 @@ const char* getConfigurationName(engine_type_e engineType) {
 		return "Test";
 	case SACHS:
 		return "SACHS";
+	case GM_2_2:
+	  return "GM_2_2";
 	case MAZDA_626:
 		return "Mazda626";
 	default:
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index 86075af3d3..8bd02a4421 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -290,5 +290,5 @@ int getRusEfiVersion(void) {
 		return 123; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE[0] * 0 != 0)
 		return 3211; // this is here to make the compiler happy about the unused array
-	return 20150408;
+	return 20150409;
 }