From c55120372bd40c3a937b22c57e6ee6bee763844a Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 3 Dec 2020 21:31:58 -0500 Subject: [PATCH] DAIHATSU 3CYLINDER TRIGGER WHEEL SUPPORT #2008 --- .../cypress/config/controllers/algo/auto_generated_enums.cpp | 4 ++-- .../kinetis/config/controllers/algo/auto_generated_enums.cpp | 4 ++-- 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 | 1 + 6 files changed, 9 insertions(+), 8 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 ebe40266b3..2fbee8073d 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 @@ -1421,8 +1421,8 @@ case TT_UNUSED_30: return "TT_UNUSED_30"; case TT_UNUSED_42: return "TT_UNUSED_42"; -case TT_UNUSED_6: - return "TT_UNUSED_6"; +case TT_TT_DAIHATSU: + return "TT_TT_DAIHATSU"; case TT_VVT_BOSCH_QUICK_START: return "TT_VVT_BOSCH_QUICK_START"; case TT_VVT_JZ: 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 097551bde3..afcdf44162 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 @@ -1217,8 +1217,8 @@ case TT_UNUSED_30: return "TT_UNUSED_30"; case TT_UNUSED_42: return "TT_UNUSED_42"; -case TT_UNUSED_6: - return "TT_UNUSED_6"; +case TT_TT_DAIHATSU: + return "TT_TT_DAIHATSU"; case TT_VVT_BOSCH_QUICK_START: return "TT_VVT_BOSCH_QUICK_START"; case TT_VVT_JZ: diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 7c82647e6f..079802fc7b 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1363,8 +1363,8 @@ case TT_UNUSED_30: return "TT_UNUSED_30"; case TT_UNUSED_42: return "TT_UNUSED_42"; -case TT_UNUSED_6: - return "TT_UNUSED_6"; +case TT_TT_DAIHATSU: + return "TT_TT_DAIHATSU"; case TT_VVT_BOSCH_QUICK_START: return "TT_VVT_BOSCH_QUICK_START"; case TT_VVT_JZ: diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index e20ac3b6a4..78a4c8b093 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -214,7 +214,6 @@ typedef enum { * @see http://rusefi.com/wiki/index.php?title=Manual:Software:Trigger */ typedef enum { - TT_UNUSED_6 = 6, TT_UNUSED_42 = 42, TT_TOOTHED_WHEEL = TT_TT_TOOTHED_WHEEL, @@ -230,6 +229,7 @@ typedef enum { TT_MAZDA_MIATA_NB1 = TT_TT_MAZDA_MIATA_NB1, TT_GM_7X = TT_TT_GM_7X, TT_MAZDA_SOHC_4 = TT_TT_MAZDA_SOHC_4, + TT_TT_DAIHATSU = 6, /** * "60/2" * See also TT_ONE_PLUS_TOOTHED_WHEEL_60_2 diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp index 63ef753392..b9bd129304 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.cpp +++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp @@ -542,7 +542,7 @@ void TriggerWaveform::initializeTriggerWaveform(Logging *logger, operation_mode_ configureMazdaProtegeSOHC(this); break; - case TT_UNUSED_6: + case TT_TT_DAIHATSU: case TT_VVT_JZ: setToothedWheelConfiguration(this, 3, 0, ambiguousOperationMode); break; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index e5174be4c0..80600f5d24 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -390,6 +390,7 @@ end_struct #define TT_TT_MAZDA_MIATA_NA 3 #define TT_TT_MAZDA_MIATA_NB1 4 #define TT_TT_GM_7X 5 +#define TT_TT_DAIHATSU 6 #define TT_TT_MAZDA_SOHC_4 7 #define TT_TT_TOOTHED_WHEEL_60_2 8 #define TT_TT_TOOTHED_WHEEL_36_1 9