From 1a1b7f95c08a1a579f42c46ca99f2c2aed6b6f78 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 31 Aug 2021 05:54:04 -0400 Subject: [PATCH] Subaru svx vvt #3210 helping or not --- firmware/controllers/algo/auto_generated_commonenum.cpp | 6 +++++- firmware/controllers/algo/rusefi_enums.h | 5 ++++- firmware/controllers/trigger/decoders/trigger_structure.cpp | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/firmware/controllers/algo/auto_generated_commonenum.cpp b/firmware/controllers/algo/auto_generated_commonenum.cpp index 28644b1f34..84c7fe5fdf 100644 --- a/firmware/controllers/algo/auto_generated_commonenum.cpp +++ b/firmware/controllers/algo/auto_generated_commonenum.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "rusefi_enums.h" -// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Aug 14 06:50:48 UTC 2021 +// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Tue Aug 31 05:42:43 EDT 2021 // see also gen_config_and_enums.bat @@ -1000,6 +1000,10 @@ case TT_SUBARU_7_WITHOUT_6: return "TT_SUBARU_7_WITHOUT_6"; case TT_SUBARU_SVX: return "TT_SUBARU_SVX"; +case TT_SUBARU_SVX_CAM_VVT: + return "TT_SUBARU_SVX_CAM_VVT"; +case TT_SUBARU_SVX_CRANK_1: + return "TT_SUBARU_SVX_CRANK_1"; case TT_TEMP_62: return "TT_TEMP_62"; case TT_TOOTHED_WHEEL: diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 17d901c383..c1df2f93f5 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -412,6 +412,9 @@ typedef enum { TT_TEMP_62 = TT_TT_TEMP_62, + TT_SUBARU_SVX_CRANK_1 = TT_TT_SUBARU_SVX_CRANK_1, + + TT_SUBARU_SVX_CAM_VVT = TT_TT_SUBARU_SVX_CAM_VVT, // do not forget to edit "#define trigger_type_e_enum" line in integration/rusefi_config.txt file to propogate new value to rusefi.ini TS project // do not forget to invoke "gen_config.bat" once you make changes to integration/rusefi_config.txt @@ -419,7 +422,7 @@ typedef enum { // // Another point: once you add a new trigger, run get_trigger_images.bat which would run rusefi_test.exe from unit_tests // - TT_UNUSED = 63, // this is used if we want to iterate over all trigger types + TT_UNUSED = 65, // this is used if we want to iterate over all trigger types // todo: convert to ENUM_16_BITS? I can see 257 triggers but not 65K triggers Force_4_bytes_size_trigger_type = ENUM_32_BITS, diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp index f254443749..3c6cd64d01 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.cpp +++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp @@ -739,6 +739,10 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e ambiguousOperat initializeSubaru_SVX(this); break; + case TT_SUBARU_SVX_CRANK_1: + + case TT_SUBARU_SVX_CAM_VVT: + default: setShapeDefinitionError(true); warning(CUSTOM_ERR_NO_SHAPE, "initializeTriggerWaveform() not implemented: %d", triggerConfig->type);