diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index b08f245e62..3ab51898a1 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -30,5 +30,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/vw.cpp \ $(PROJECT_DIR)/config/engines/dodge_stratus.cpp \ $(PROJECT_DIR)/config/engines/chevrolet_camaro_4.cpp \ + $(PROJECT_DIR)/config/engines/suzuki_vitara.cpp \ $(PROJECT_DIR)/config/engines/daihatsu.cpp \ No newline at end of file diff --git a/firmware/config/engines/suzuki_vitara.cpp b/firmware/config/engines/suzuki_vitara.cpp new file mode 100644 index 0000000000..7a81897a54 --- /dev/null +++ b/firmware/config/engines/suzuki_vitara.cpp @@ -0,0 +1,24 @@ +/* + * @file suzuki_vitara.cpp + * + * set_engine_type 36 + * + * @author Andrey Belomutskiy, (c) 2012-2015 + * @date Oct 17, 2015 + */ + +#include "suzuki_vitara.h" + +EXTERN_ENGINE; + +void setSuzukiVitara(DECLARE_ENGINE_PARAMETER_F) { + engineConfiguration->trigger.type = TT_MAZDA_SOHC_4; + engineConfiguration->specs.cylindersCount = 4; + engineConfiguration->specs.displacement = 1.590; + + engineConfiguration->ignitionMode = IM_ONE_COIL; + engineConfiguration->injectionMode = IM_SIMULTANEOUS; + +} + + diff --git a/firmware/config/engines/suzuki_vitara.h b/firmware/config/engines/suzuki_vitara.h new file mode 100644 index 0000000000..d429a63e48 --- /dev/null +++ b/firmware/config/engines/suzuki_vitara.h @@ -0,0 +1,15 @@ +/* + * @file suzuki_vitara.cpp + * + * @author Andrey Belomutskiy, (c) 2012-2015 + * @date Oct 17, 2015 + */ + +#ifndef CONFIG_ENGINES_SUZUKI_VITARA_H_ +#define CONFIG_ENGINES_SUZUKI_VITARA_H_ + +#include "engine.h" + +void setSuzukiVitara(DECLARE_ENGINE_PARAMETER_F); + +#endif /* CONFIG_ENGINES_SUZUKI_VITARA_H_ */ diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 98a1de3df9..9fb9b86169 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -30,6 +30,8 @@ case SACHS: return "SACHS"; case DAIHATSU: return "DAIHATSU"; +case SUZUKI_VITARA: + return "SUZUKI_VITARA"; case CAMARO_4: return "CAMARO_4"; case GM_2_2: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index d4a1e75369..e6b51ea07b 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -64,6 +64,7 @@ #include "dodge_stratus.h" #include "daihatsu.h" #include "chevrolet_camaro_4.h" +#include "suzuki_vitara.h" EXTERN_ENGINE; @@ -703,6 +704,9 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN case SATURN_ION_2004: setSaturnIonEngineConfiguration(engineConfiguration); break; + case SUZUKI_VITARA: + setSuzukiVitara(PASS_ENGINE_PARAMETER_F); + break; case MINI_COOPER_R50: setMiniCooperR50(engineConfiguration); break; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 5a6c0df27a..e57f5b3f22 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -107,7 +107,9 @@ typedef enum { CAMARO_4 = 35, - ET_UNUSED = 36, + SUZUKI_VITARA = 36, + + ET_UNUSED = 37, Force_4b_engine_type = ENUM_32_BITS, } engine_type_e; diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index b4a2751660..d9263ad420 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -180,6 +180,10 @@ const char* getConfigurationName(engine_type_e engineType) { return "SACHS"; case DAIHATSU: return "DAIHATSU"; + case SUZUKI_VITARA: + return "SUZUKI_VITARA"; + case CAMARO_4: + return "CAMARO_4"; case GM_2_2: return "GM_2_2"; case DODGE_RAM: diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 2c246da522..a99505ad37 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -275,5 +275,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 20151012; + return 20151017; }