From 225e403973e0bfa687af97f7268ee42cca50795b Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Wed, 29 Jul 2020 02:22:31 -0700 Subject: [PATCH] parameter names --- firmware/controllers/actuators/electronic_throttle.cpp | 8 ++++---- firmware/controllers/actuators/electronic_throttle.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp index 599a2e42b4..1a93b3402f 100644 --- a/firmware/controllers/actuators/electronic_throttle.cpp +++ b/firmware/controllers/actuators/electronic_throttle.cpp @@ -323,7 +323,7 @@ expected EtbController::getClosedLoopAutotune(percent_t actualThrottl return autotuneAmplitude * (isPositive ? -1 : 1); } -expected EtbController::getClosedLoop(percent_t target, percent_t actualThrottlePosition) { +expected EtbController::getClosedLoop(percent_t target, percent_t observation) { if (m_shouldResetPid) { m_pid.reset(); m_shouldResetPid = false; @@ -333,16 +333,16 @@ expected EtbController::getClosedLoop(percent_t target, percent_t act if (m_myIndex == 0) { #if EFI_TUNER_STUDIO // Error is positive if the throttle needs to open further - tsOutputChannels.etb1Error = target - actualThrottlePosition; + tsOutputChannels.etb1Error = target - observation; #endif /* EFI_TUNER_STUDIO */ } // Only allow autotune with stopped engine if (GET_RPM() == 0 && engine->etbAutoTune) { - return getClosedLoopAutotune(actualThrottlePosition); + return getClosedLoopAutotune(observation); } else { // Normal case - use PID to compute closed loop part - return m_pid.getOutput(target, actualThrottlePosition, 1.0f / ETB_LOOP_FREQUENCY); + return m_pid.getOutput(target, observation, 1.0f / ETB_LOOP_FREQUENCY); } } diff --git a/firmware/controllers/actuators/electronic_throttle.h b/firmware/controllers/actuators/electronic_throttle.h index e4b1ca666e..9530e914f5 100644 --- a/firmware/controllers/actuators/electronic_throttle.h +++ b/firmware/controllers/actuators/electronic_throttle.h @@ -55,7 +55,7 @@ public: expected getSetpoint() const override; expected getOpenLoop(percent_t target) const override; - expected getClosedLoop(percent_t setpoint, percent_t target) override; + expected getClosedLoop(percent_t setpoint, percent_t observation) override; expected getClosedLoopAutotune(percent_t actualThrottlePosition); void setOutput(expected outputValue) override;