From 06cbbca238963d486cd35282180fabea3a533cfe Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Wed, 3 Jul 2024 01:14:03 -0700 Subject: [PATCH] accel enrich commands --- .../controllers/algo/accel_enrichment.cpp | 28 +++++-------------- firmware/controllers/algo/accel_enrichment.h | 5 ---- firmware/controllers/settings.cpp | 4 --- 3 files changed, 7 insertions(+), 30 deletions(-) diff --git a/firmware/controllers/algo/accel_enrichment.cpp b/firmware/controllers/algo/accel_enrichment.cpp index 94d010dcb7..97e650b476 100644 --- a/firmware/controllers/algo/accel_enrichment.cpp +++ b/firmware/controllers/algo/accel_enrichment.cpp @@ -195,29 +195,15 @@ TpsAccelEnrichment::TpsAccelEnrichment() { #if ! EFI_UNIT_TEST -void setTpsAccelThr(float value) { - engineConfiguration->tpsAccelEnrichmentThreshold = value; -} - -void setTpsDecelThr(float value) { - engineConfiguration->tpsDecelEnleanmentThreshold = value; -} - -void setTpsDecelMult(float value) { - engineConfiguration->tpsDecelEnleanmentMultiplier = value; -} - -void setTpsAccelLen(int length) { - if (length < 1) { - efiPrintf("Length should be positive"); - return; - } - engine->tpsAccelEnrichment.setLength(length); -} - void updateAccelParameters() { constexpr float slowCallbackPeriodSecond = SLOW_CALLBACK_PERIOD_MS / 1000.0f; - setTpsAccelLen(engineConfiguration->tpsAccelLookback / slowCallbackPeriodSecond); + int length = engineConfiguration->tpsAccelLookback / slowCallbackPeriodSecond; + + if (length < 1) { + length = 1; + } + + engine->tpsAccelEnrichment.setLength(length); } #endif /* ! EFI_UNIT_TEST */ diff --git a/firmware/controllers/algo/accel_enrichment.h b/firmware/controllers/algo/accel_enrichment.h index 74a10c2b43..1f653a6520 100644 --- a/firmware/controllers/algo/accel_enrichment.h +++ b/firmware/controllers/algo/accel_enrichment.h @@ -39,9 +39,4 @@ public: void initAccelEnrichment(); -void setTpsAccelThr(float value); -void setTpsDecelThr(float value); -void setTpsDecelMult(float value); -void setTpsAccelLen(int length); - void updateAccelParameters(); diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 5c323c353c..d5e3ce1fb7 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -378,9 +378,6 @@ const command_f_s commandsF[] = { {"global_trigger_offset_angle", setGlobalTriggerAngleOffset}, {"cranking_iac", setCrankingIACExtra}, {"cranking_timing_angle", setCrankingTimingAngle}, - {"tps_accel_threshold", setTpsAccelThr}, - {"tps_decel_threshold", setTpsDecelThr}, - {"tps_decel_multiplier", setTpsDecelMult}, #endif // EFI_ENGINE_CONTROL #if EFI_ELECTRONIC_THROTTLE_BODY @@ -402,7 +399,6 @@ const command_i_s commandsI[] = {{"ignition_mode", setIgnitionMode}, {"debug_mode", setDebugMode}, {"trigger_type", setTriggerType}, {"idle_solenoid_freq", setIdleSolenoidFrequency}, - {"tps_accel_len", setTpsAccelLen}, #endif // EFI_ENGINE_CONTROL #if EFI_PROD_CODE #if EFI_CAN_SUPPORT