From 760eb889a6a698a3938c9769138d4a767b8fc5f4 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 21 Feb 2023 21:43:05 -0500 Subject: [PATCH] Revert "Feb20: 3rd ticket for 4g9x mess #5111" This reverts commit 61eefa205b2034598f2bd31ef28f7934bcaffac5. --- firmware/controllers/algo/defaults/default_base_engine.cpp | 3 --- firmware/controllers/algo/engine_configuration.cpp | 4 ---- firmware/controllers/trigger/instant_rpm_calculator.cpp | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/firmware/controllers/algo/defaults/default_base_engine.cpp b/firmware/controllers/algo/defaults/default_base_engine.cpp index cb9c940416..554e34d02c 100644 --- a/firmware/controllers/algo/defaults/default_base_engine.cpp +++ b/firmware/controllers/algo/defaults/default_base_engine.cpp @@ -26,9 +26,6 @@ void setDefaultBaseEngine() { engineConfiguration->specs.displacement = 2; engineConfiguration->specs.firingOrder = FO_1_3_4_2; - // todo: extract constant in instant_rpm_calculator.h? - engineConfiguration->instantRpmRange = 90; - engineConfiguration->compressionRatio = 9; engineConfiguration->turbochargerFilter = 0.01f; diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 1aaf57bdee..e5d509d4b7 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1014,10 +1014,6 @@ void validateConfiguration() { if (engineConfiguration->adcVcc > 5.0f || engineConfiguration->adcVcc < 1.0f) { engineConfiguration->adcVcc = 3.0f; } - if (engineConfiguration->instantRpmRange == 0) { - // todo: extract constant in instant_rpm_calculator.h? - engineConfiguration->instantRpmRange = 90; - } engine->preCalculate(); } diff --git a/firmware/controllers/trigger/instant_rpm_calculator.cpp b/firmware/controllers/trigger/instant_rpm_calculator.cpp index e8287831fb..2461ff719f 100644 --- a/firmware/controllers/trigger/instant_rpm_calculator.cpp +++ b/firmware/controllers/trigger/instant_rpm_calculator.cpp @@ -57,7 +57,7 @@ float InstantRpmCalculator::calculateInstantRpm( efiAssert(OBD_PCM_Processor_Fault, !cisnan(currentAngle), "eventAngles", 0); // Hunt for a tooth ~90 degrees ago to compare to the current time - angle_t previousAngle = currentAngle - engineConfiguration->instantRpmRange; + angle_t previousAngle = currentAngle - 90; fixAngle(previousAngle, "prevAngle", CUSTOM_ERR_TRIGGER_ANGLE_RANGE); int prevIndex = triggerShape.findAngleIndex(triggerFormDetails, previousAngle);