diff --git a/firmware/config/engines/harley.cpp b/firmware/config/engines/harley.cpp index 749831acd3..ce5df68c3c 100644 --- a/firmware/config/engines/harley.cpp +++ b/firmware/config/engines/harley.cpp @@ -12,7 +12,7 @@ void proteusHarley() { // for now we need non wired camInput to keep TS field enable/disable logic happy engineConfiguration->camInputs[0] = PROTEUS_DIGITAL_6; - engineConfiguration->vvtMode[0] = VVT_MAP_V_TWIN_ANOTHER; + engineConfiguration->vvtMode[0] = VVT_MAP_V_TWIN; engineConfiguration->luaOutputPins[0] = PROTEUS_LS_12; #if HW_PROTEUS diff --git a/firmware/controllers/algo/auto_generated_commonenum.cpp b/firmware/controllers/algo/auto_generated_commonenum.cpp index 85a690929c..f9e78432ef 100644 --- a/firmware/controllers/algo/auto_generated_commonenum.cpp +++ b/firmware/controllers/algo/auto_generated_commonenum.cpp @@ -740,8 +740,8 @@ case VVT_HONDA_K: return "VVT_HONDA_K"; case VVT_INACTIVE: return "VVT_INACTIVE"; -case VVT_MAP_V_TWIN_ANOTHER: - return "VVT_MAP_V_TWIN_ANOTHER"; +case VVT_MAP_V_TWIN: + return "VVT_MAP_V_TWIN"; case VVT_MAZDA_SKYACTIV: return "VVT_MAZDA_SKYACTIV"; case VVT_MIATA_NB: diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp index fb813ac221..97c4879b2e 100644 --- a/firmware/controllers/algo/engine.cpp +++ b/firmware/controllers/algo/engine.cpp @@ -77,7 +77,7 @@ trigger_type_e getVvtTriggerType(vvt_mode_e vvtMode) { case VVT_HONDA_K: case VVT_FIRST_HALF: case VVT_SECOND_HALF: - case VVT_MAP_V_TWIN_ANOTHER: + case VVT_MAP_V_TWIN: return TT_ONE; case VVT_FORD_ST170: return TT_FORD_ST170; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 1f61d43d41..f1e5cde05c 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -114,7 +114,7 @@ typedef enum __attribute__ ((__packed__)) { VVT_MITSUBISHI_3A92 = 12, - VVT_MAP_V_TWIN_ANOTHER = 13, + VVT_MAP_V_TWIN = 13, VVT_MITSUBISHI_6G75 = 14, diff --git a/firmware/controllers/engine_cycle/main_trigger_callback.cpp b/firmware/controllers/engine_cycle/main_trigger_callback.cpp index 04f7c70146..fe60576d5d 100644 --- a/firmware/controllers/engine_cycle/main_trigger_callback.cpp +++ b/firmware/controllers/engine_cycle/main_trigger_callback.cpp @@ -342,7 +342,7 @@ bool noFiringUntilVvtSync(vvt_mode_e vvtMode) { auto operationMode = engine->getOperationMode(); // V-Twin MAP phase sense needs to always wait for sync - if (vvtMode == VVT_MAP_V_TWIN_ANOTHER) { + if (vvtMode == VVT_MAP_V_TWIN) { return true; } diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 8d418f1021..cffd13dbd1 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -119,7 +119,7 @@ static bool vvtWithRealDecoder(vvt_mode_e vvtMode) { return vvtMode != VVT_INACTIVE && vvtMode != VVT_2JZ && vvtMode != VVT_HONDA_K - && vvtMode != VVT_MAP_V_TWIN_ANOTHER + && vvtMode != VVT_MAP_V_TWIN && vvtMode != VVT_SECOND_HALF && vvtMode != VVT_FIRST_HALF; } @@ -161,7 +161,7 @@ static angle_t adjustCrankPhase(int camIndex) { vvt_mode_e vvtMode = engineConfiguration->vvtMode[camIndex]; switch (vvtMode) { case VVT_FIRST_HALF: - case VVT_MAP_V_TWIN_ANOTHER: + case VVT_MAP_V_TWIN: return syncAndReport(tc, getCrankDivider(operationMode), 1); case VVT_SECOND_HALF: case VVT_NISSAN_VQ: @@ -604,7 +604,7 @@ bool TriggerNoiseFilter::noiseFilter(efitick_t nowNt, void TriggerCentral::decodeMapCam(efitick_t timestamp, float currentPhase) { #if WITH_TS_STATE - if (engineConfiguration->vvtMode[0] == VVT_MAP_V_TWIN_ANOTHER && + if (engineConfiguration->vvtMode[0] == VVT_MAP_V_TWIN && Sensor::getOrZero(SensorType::Rpm) < engineConfiguration->cranking.rpm) { // we are trying to figure out which 360 half of the total 720 degree cycle is which, so we compare those in 360 degree sense. auto toothAngle360 = currentPhase; diff --git a/unit_tests/tests/trigger/test_map_cam.cpp b/unit_tests/tests/trigger/test_map_cam.cpp index 6a86244b91..9f77edd11d 100644 --- a/unit_tests/tests/trigger/test_map_cam.cpp +++ b/unit_tests/tests/trigger/test_map_cam.cpp @@ -10,7 +10,7 @@ TEST(trigger, map_cam_by_magic_point) { engineConfiguration->isFasterEngineSpinUpEnabled = false; engineConfiguration->camInputs[0] = Gpio::A0; - engineConfiguration->vvtMode[0] = VVT_MAP_V_TWIN_ANOTHER; + engineConfiguration->vvtMode[0] = VVT_MAP_V_TWIN; eth.engine.periodicFastCallback(); // trigger limp mode ASSERT_FALSE(eth.engine.limpManager.allowIgnition()); ASSERT_FALSE(eth.engine.limpManager.allowInjection());