diff --git a/firmware/controllers/algo/auto_generated_commonenum.cpp b/firmware/controllers/algo/auto_generated_commonenum.cpp index bc5c258aac..10b4f12bff 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 Wed Dec 08 12:08:09 UTC 2021 +// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Thu Dec 16 21:14:24 EST 2021 // see also gen_config_and_enums.bat @@ -683,6 +683,8 @@ case VE_TPS: } const char *getVvt_mode_e(vvt_mode_e value){ switch(value) { +case VVT_12: + return "VVT_12"; case VVT_2JZ: return "VVT_2JZ"; case VVT_BARRA_3_PLUS_1: @@ -697,8 +699,6 @@ case VVT_HONDA_K: return "VVT_HONDA_K"; case VVT_INACTIVE: return "VVT_INACTIVE"; -case VVT_MAP_V_TWIN: - return "VVT_MAP_V_TWIN"; case VVT_MAP_V_TWIN_ANOTHER: return "VVT_MAP_V_TWIN_ANOTHER"; case VVT_MIATA_NB2: diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp index 88d367f691..da823b9619 100644 --- a/firmware/controllers/algo/auto_generated_enginetypes.cpp +++ b/firmware/controllers/algo/auto_generated_enginetypes.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "engine_types.h" -// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Thu Dec 16 21:22:28 UTC 2021 +// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Thu Dec 16 21:16:03 EST 2021 // see also gen_config_and_enums.bat @@ -514,14 +514,14 @@ case TT_TRI_TACH: return "TT_TRI_TACH"; case TT_UNUSED: return "TT_UNUSED"; +case TT_UNUSED_62: + return "TT_UNUSED_62"; case TT_VVT_BARRA_3_PLUS_1: return "TT_VVT_BARRA_3_PLUS_1"; case TT_VVT_BOSCH_QUICK_START: return "TT_VVT_BOSCH_QUICK_START"; case TT_VVT_JZ: return "TT_VVT_JZ"; -case TT_VVT_MAP_45_V_TWIN: - return "TT_VVT_MAP_45_V_TWIN"; case TT_VVT_MIATA_NB2: return "TT_VVT_MIATA_NB2"; case TT_VVT_NISSAN_VQ35: diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp index 41ce7b831e..3fa5464361 100644 --- a/firmware/controllers/algo/engine.cpp +++ b/firmware/controllers/algo/engine.cpp @@ -97,8 +97,6 @@ trigger_type_e getVvtTriggerType(vvt_mode_e vvtMode) { return TT_VVT_NISSAN_VQ35; case VVT_NISSAN_MR: return TT_NISSAN_MR18_CAM_VVT; - case VVT_MAP_V_TWIN: - return TT_VVT_MAP_45_V_TWIN; default: firmwareError(OBD_PCM_Processor_Fault, "getVvtTriggerType for %s", getVvt_mode_e(vvtMode)); return TT_ONE; // we have to return something for the sake of -Werror=return-type diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index ec41145acf..af83333a28 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -503,7 +503,7 @@ typedef enum { TT_NISSAN_QR25 = 61, - TT_VVT_MAP_45_V_TWIN = 62, + TT_UNUSED_62 = 62, TT_SUBARU_SVX_CRANK_1 = 63, diff --git a/firmware/controllers/trigger/decoders/trigger_misc.cpp b/firmware/controllers/trigger/decoders/trigger_misc.cpp index 169ed22e82..7bcbf8ff90 100644 --- a/firmware/controllers/trigger/decoders/trigger_misc.cpp +++ b/firmware/controllers/trigger/decoders/trigger_misc.cpp @@ -8,19 +8,6 @@ #include "trigger_misc.h" #include "trigger_universal.h" -void configureVvt45VTwin(TriggerWaveform *s) { - s->initialize(FOUR_STROKE_CAM_SENSOR); - - s->setTriggerSynchronizationGap(0.78); - s->setSecondTriggerSynchronizationGap(1.29); - - s->addEvent720(315 - 1, T_PRIMARY, TV_RISE); - s->addEvent720(315, T_PRIMARY, TV_FALL); - - s->addEvent720(720 - 1, T_PRIMARY, TV_RISE); - s->addEvent720(720, T_PRIMARY, TV_FALL); -} - // TT_FIAT_IAW_P8 void configureFiatIAQ_P8(TriggerWaveform * s) { s->initialize(FOUR_STROKE_CAM_SENSOR); diff --git a/firmware/controllers/trigger/decoders/trigger_misc.h b/firmware/controllers/trigger/decoders/trigger_misc.h index 7ac584c04b..63420ef218 100644 --- a/firmware/controllers/trigger/decoders/trigger_misc.h +++ b/firmware/controllers/trigger/decoders/trigger_misc.h @@ -16,5 +16,3 @@ void configureFordST170(TriggerWaveform * s); void configureTriTach(TriggerWaveform * s); // TT_VVT_BARRA_3_PLUS_1 void configureBarra3plus1cam(TriggerWaveform *s); -void configureVvt45VTwin(TriggerWaveform *s); - diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp index f68c3f0002..ebdea232f7 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.cpp +++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp @@ -526,10 +526,7 @@ void TriggerWaveform::initializeTriggerWaveform(operation_mode_e ambiguousOperat initializeNissanVQvvt(this); break; - case TT_VVT_MAP_45_V_TWIN: - configureVvt45VTwin(this); - break; - + case TT_UNUSED_62: case TT_NISSAN_QR25: initializeNissanQR25crank(this); break; diff --git a/firmware/controllers/trigger/trigger_central.h b/firmware/controllers/trigger/trigger_central.h index 43d9c48346..9edf6061a4 100644 --- a/firmware/controllers/trigger/trigger_central.h +++ b/firmware/controllers/trigger/trigger_central.h @@ -49,9 +49,6 @@ public: LocalVersionHolder triggerVersion; - MapState mapState; - - angle_t mapCamPrevToothAngle = -1; float mapCamPrevCycleValue = 0; int prevChangeAtCycle = 0; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index b9d9886f15..806da01b0d 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -296,7 +296,7 @@ custom debug_mode_e 4 bits, U32, @OFFSET@, [0:5], @@debug_mode_e_enum@@ #define VM_VVT_INACTIVE 0 -#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15" +#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "INVALID", "VTwin by MAP", "vvt14", "vvt15" custom vvt_mode_e 1 bits, U08, @OFFSET@, [0:3], @@vvt_mode_e_enum@@ ! At the moment TIM1, TIM2, TIM3 and TIM9 are configured as ICU diff --git a/java_console/io/src/main/java/com/rusefi/enums/trigger_type_e.java b/java_console/io/src/main/java/com/rusefi/enums/trigger_type_e.java index 4ab64ce9cd..710bfaa1e7 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/trigger_type_e.java +++ b/java_console/io/src/main/java/com/rusefi/enums/trigger_type_e.java @@ -66,7 +66,7 @@ public enum trigger_type_e { TT_VVT_NISSAN_VQ35, TT_NISSAN_VQ30, TT_NISSAN_QR25, - TT_VVT_MAP_45_V_TWIN, + TT_UNUSED_62, TT_SUBARU_SVX_CRANK_1, TT_SUBARU_SVX_CAM_VVT, TT_FORD_TFI_PIP, diff --git a/unit_tests/tests/tests.mk b/unit_tests/tests/tests.mk index d148fc4dc9..c7a152e8a2 100644 --- a/unit_tests/tests/tests.mk +++ b/unit_tests/tests/tests.mk @@ -20,7 +20,6 @@ TESTS_SRC_CPP = \ tests/trigger/test_nissan_vq_vvt.cpp \ tests/trigger/test_override_gaps.cpp \ tests/trigger/test_injection_scheduling.cpp \ - tests/trigger/test_instant_map.cpp \ tests/ignition_injection/injection_mode_transition.cpp \ tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp \ tests/ignition_injection/test_multispark.cpp \