From 314e9ef5803f7ee7b935275cd0798052fc84f243 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 13 Dec 2020 17:46:48 -0500 Subject: [PATCH] TT_SUBARU_7_WITHOUT_6 --- .../cypress/config/controllers/algo/auto_generated_enums.cpp | 4 ++-- .../kinetis/config/controllers/algo/auto_generated_enums.cpp | 4 ++-- firmware/config/engines/subaru.cpp | 2 +- firmware/controllers/algo/auto_generated_enums.cpp | 4 ++-- firmware/controllers/algo/rusefi_enums.h | 2 +- firmware/controllers/trigger/decoders/trigger_structure.cpp | 2 +- firmware/integration/rusefi_config.txt | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp index 686968364c..053fdfe6ee 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp @@ -1337,8 +1337,8 @@ case TT_36_2_2_2: return "TT_36_2_2_2"; case TT_3_1_CAM: return "TT_3_1_CAM"; -case TT_51: - return "TT_51"; +case TT_SUBARU_7_WITHOUT_6: + return "TT_SUBARU_7_WITHOUT_6"; case TT_52: return "TT_52"; case TT_60_2_VW: diff --git a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp index 9d26b2deaa..6a61278bea 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp @@ -1133,8 +1133,8 @@ case TT_36_2_2_2: return "TT_36_2_2_2"; case TT_3_1_CAM: return "TT_3_1_CAM"; -case TT_51: - return "TT_51"; +case TT_SUBARU_7_WITHOUT_6: + return "TT_SUBARU_7_WITHOUT_6"; case TT_52: return "TT_52"; case TT_60_2_VW: diff --git a/firmware/config/engines/subaru.cpp b/firmware/config/engines/subaru.cpp index f23277aaed..2f4b74a74c 100644 --- a/firmware/config/engines/subaru.cpp +++ b/firmware/config/engines/subaru.cpp @@ -40,7 +40,7 @@ void setSubaru2003Wrx(DECLARE_CONFIG_PARAMETER_SIGNATURE) { * set engine_type 37 */ void setSubaruEJ18_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - engineConfiguration->trigger.type = TT_SUBARU_7_6; + engineConfiguration->trigger.type = TT_SUBARU_7_WITHOUT_6; // CONFIG(isDoubleSolenoidIdle) = true; diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 515e3aafe3..3ddc8f6864 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1279,8 +1279,8 @@ case TT_36_2_2_2: return "TT_36_2_2_2"; case TT_3_1_CAM: return "TT_3_1_CAM"; -case TT_51: - return "TT_51"; +case TT_SUBARU_7_WITHOUT_6: + return "TT_SUBARU_7_WITHOUT_6"; case TT_52: return "TT_52"; case TT_60_2_VW: diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index a7cb8c3a3f..3fa1d26a22 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -361,7 +361,7 @@ typedef enum { TT_1_16 = 50, - TT_51 = TT_TT_51, + TT_SUBARU_7_WITHOUT_6 = TT_TT_SUBARU_7_WITHOUT_6, TT_52 = TT_TT_52, diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp index 4fcc32a4b9..ff5d2fd6b8 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.cpp +++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp @@ -664,7 +664,7 @@ void TriggerWaveform::initializeTriggerWaveform(Logging *logger, operation_mode_ initGmLS24(this); break; - case TT_51: + case TT_SUBARU_7_WITHOUT_6: case TT_52: initializeSubaruOnly7(this); break; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 0409d27c82..68bcc77f61 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -422,7 +422,7 @@ end_struct #define TT_TT_TOOTHED_WHEEL_36_2 48 #define TT_TT_SUBARU_SVX 49 #define TT_TT_1_16 50 -#define TT_TT_51 51 +#define TT_TT_SUBARU_7_WITHOUT_6 51 #define TT_TT_52 52