From be5a53c92c7e0214f81ca1857d75ec7773c51329 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 30 Dec 2015 16:02:18 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/custom_engine.cpp | 2 +- firmware/config/engines/engines.mk | 3 +- firmware/config/engines/toyota_jzs147.cpp | 30 +++++++++++++++++++ firmware/config/engines/toyota_jzs147.h | 15 ++++++++++ .../controllers/algo/auto_generated_enums.cpp | 2 ++ .../controllers/algo/engine_configuration.cpp | 5 +++- firmware/controllers/algo/rusefi_enums.h | 4 ++- firmware/rusefi.cpp | 2 +- 8 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 firmware/config/engines/toyota_jzs147.cpp create mode 100644 firmware/config/engines/toyota_jzs147.h diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 29d322fe19..6c2a4e8072 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -101,7 +101,7 @@ void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { boardConfiguration->injectionPins[11] = GPIO_UNASSIGNED; boardConfiguration->ignitionPins[0] = GPIOE_14; - boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; // todo: update this value + boardConfiguration->ignitionPins[1] = GPIOC_9; boardConfiguration->ignitionPins[2] = GPIOC_7; boardConfiguration->ignitionPins[3] = GPIO_UNASSIGNED; // todo: update this value #endif diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index 84c1287d76..8d5616ec7d 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -32,5 +32,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/chevrolet_camaro_4.cpp \ $(PROJECT_DIR)/config/engines/suzuki_vitara.cpp \ $(PROJECT_DIR)/config/engines/daihatsu.cpp \ - $(PROJECT_DIR)/config/engines/chevrolet_c20_1973.cpp + $(PROJECT_DIR)/config/engines/chevrolet_c20_1973.cpp \ + $(PROJECT_DIR)/config/engines/toyota_jzs147.cpp \ No newline at end of file diff --git a/firmware/config/engines/toyota_jzs147.cpp b/firmware/config/engines/toyota_jzs147.cpp new file mode 100644 index 0000000000..85c5224cfc --- /dev/null +++ b/firmware/config/engines/toyota_jzs147.cpp @@ -0,0 +1,30 @@ +/* + * @file toyota_jzs147.cpp + * + * toyota aristo + * https://en.wikipedia.org/wiki/Lexus_GS + * http://rusefi.com/forum/viewtopic.php?f=15&t=969 + * + * set_engine_type 38 + * + * @date Dec 30, 2015 + * @author Andrey Belomutskiy, (c) 2012-2015 + */ + +#include "toyota_jzs147.h" + +EXTERN_ENGINE; + +void setToyota_jzs147EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { + + engineConfiguration->specs.displacement = 3.0; + engineConfiguration->specs.cylindersCount = 6; + engineConfiguration->specs.firingOrder = FO_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4; + + setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); + engineConfiguration->trigger.type = TT_2JZ; + +} + + + diff --git a/firmware/config/engines/toyota_jzs147.h b/firmware/config/engines/toyota_jzs147.h new file mode 100644 index 0000000000..6b11f0752c --- /dev/null +++ b/firmware/config/engines/toyota_jzs147.h @@ -0,0 +1,15 @@ +/* + * @file toyota_jzs147.h + * + * @date Dec 30, 2015 + * @author Andrey Belomutskiy, (c) 2012-2015 + */ + +#ifndef CONFIG_ENGINES_TOYOTA_JZS147_H_ +#define CONFIG_ENGINES_TOYOTA_JZS147_H_ + +#include "engine.h" + +void setToyota_jzs147EngineConfiguration(DECLARE_ENGINE_PARAMETER_F); + +#endif /* CONFIG_ENGINES_TOYOTA_JZS147_H_ */ diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 97f10f40fc..0f4451ae45 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -36,6 +36,8 @@ case CAMARO_4: return "CAMARO_4"; case CHEVY_C20_1973: return "CHEVY C20"; +case TOYOTA_JZS147: + return "TOYOTA_JZS147"; case GM_2_2: return "GM_2_2"; case DODGE_RAM: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 88e1e53702..2988be0862 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -67,6 +67,7 @@ #include "chevrolet_camaro_4.h" #include "suzuki_vitara.h" #include "chevrolet_c20_1973.h" +#include "toyota_jzs147.h" EXTERN_ENGINE; @@ -808,7 +809,9 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN case CHEVY_C20_1973: set1973c20(PASS_ENGINE_PARAMETER_F); break; - + case TOYOTA_JZS147: + setToyota_jzs147EngineConfiguration(PASS_ENGINE_PARAMETER_F); + break; default: warning(OBD_PCM_Processor_Fault, "Unexpected engine type: %d", engineType); diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index bff57b86a7..7bdc28a76b 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -111,7 +111,9 @@ typedef enum { CHEVY_C20_1973 = 37, - ET_UNUSED = 38, + TOYOTA_JZS147 = 38, + + ET_UNUSED = 39, Force_4b_engine_type = ENUM_32_BITS, } engine_type_e; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 56e9731b50..0a49d8f8e2 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 20151227; + return 20151230; }