From e95ac81f7289ae0b234b20c593ff06b3bf7f0d2f Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Tue, 17 Sep 2024 19:11:41 -0700 Subject: [PATCH] naming consistency #489 --- firmware/controllers/actuators/electronic_throttle.cpp | 4 ++-- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/tunerstudio.template.ini | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp index e104e5b94c..06695816b6 100644 --- a/firmware/controllers/actuators/electronic_throttle.cpp +++ b/firmware/controllers/actuators/electronic_throttle.cpp @@ -609,7 +609,7 @@ void EtbController::update() { void EtbController::checkJam(percent_t setpoint, percent_t observation) { float absError = std::abs(setpoint - observation); - auto jamDetectThreshold = engineConfiguration->jamDetectThreshold; + auto jamDetectThreshold = engineConfiguration->etbJamDetectThreshold; if (jamDetectThreshold != 0) { auto nowNt = getTimeNowNt(); @@ -828,7 +828,7 @@ void setDefaultEtbParameters() { engineConfiguration->etb_iTermMin = -30; engineConfiguration->etb_iTermMax = 30; - engineConfiguration->jamDetectThreshold = 10; + engineConfiguration->etbJamDetectThreshold = 10; engineConfiguration->etbJamTimeout = 1; } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 1be69e67ae..3cbf57bec8 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1320,7 +1320,7 @@ float tChargeAirDecrLimit;Maximum allowed rate of decrease allowed for the estim uint16_t autoscale fordInjectorSmallPulseBreakPoint;;"mg", 0.001, 0, 0, 65, 3 - uint8_t jamDetectThreshold;;"%", 1, 0, 0, 50, 0 + uint8_t etbJamDetectThreshold;;"%", 1, 0, 0, 50, 0 ! Someday there will be a 6th option for BMW S55 that uses a separate shaft just for HPFP #define hpfp_cam_e_enum "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2" diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini index bd025d89cf..c1b9e47123 100644 --- a/firmware/tunerstudio/tunerstudio.template.ini +++ b/firmware/tunerstudio/tunerstudio.template.ini @@ -4225,7 +4225,7 @@ dialog = tcuControls, "Transmission Settings" field = "Minimum ETB position", etbMinimumPosition field = "Maximum ETB position", etbMaximumPosition field = "" - field = "Jam detection error max", jamDetectThreshold + field = "Jam detection error max", etbJamDetectThreshold field = "Jam detection timeout period", etbJamTimeout field = "Disables jam detection for testing until the next power cycle" commandButton = "Temporarily disable jam detection", cmd_etb_disable_jam_detect