andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only:renaming variables

This commit is contained in:
rusefillc 2024-06-17 21:08:10 -04:00
parent c74e19a0ba
commit 5c6ed75e27
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/controllers/actuators/electronic_throttle.cpp
View File

@ -165,7 +165,7 @@ static percent_t directPwmValue = NAN;
// this macro clamps both positive and negative percentages from about -100% to 100%
#define ETB_PERCENT_TO_DUTY(x) (clampF(-ETB_DUTY_LIMIT, 0.01f * (x), ETB_DUTY_LIMIT))
bool EtbController::init(dc_function_e function, DcMotor *motor, pid_s *pidParameters, const ValueProvider3D* pedalMap, bool hasPedal) {
bool EtbController::init(dc_function_e function, DcMotor *motor, pid_s *pidParameters, const ValueProvider3D* pedalProvider, bool hasPedal) {
if (function == DC_None) {
// if not configured, don't init.
etbErrorCode = (int8_t)TpsState::None;
@ -212,7 +212,7 @@ bool EtbController::init(dc_function_e function, DcMotor *motor, pid_s *pidParam
m_motor = motor;
m_pid.initPidClass(pidParameters);
m_pedalMap = pedalMap;
m_pedalProvider = pedalProvider;
// Ignore 3% position error before complaining
m_errorAccumulator.init(3.0f, etbPeriodSeconds);
@ -303,14 +303,14 @@ expected<percent_t> EtbController::getSetpointEtb() {
// }
// If the pedal map hasn't been set, we can't provide a setpoint.
if (!m_pedalMap) {
if (!m_pedalProvider) {
return unexpected;
}
float sanitizedPedal = getSanitizedPedal();
float rpm = Sensor::getOrZero(SensorType::Rpm);
etbCurrentTarget = m_pedalMap->getValue(rpm, sanitizedPedal);
etbCurrentTarget = m_pedalProvider->getValue(rpm, sanitizedPedal);
percent_t etbIdlePosition = clampPercentValue(m_idlePosition);
percent_t etbIdleAddition = PERCENT_DIV * engineConfiguration->etbIdleThrottleRange * etbIdlePosition;

2
firmware/controllers/actuators/electronic_throttle_impl.h
View File

@ -108,7 +108,7 @@ private:
Timer m_jamDetectTimer;
// Pedal -> target map
const ValueProvider3D* m_pedalMap = nullptr;
const ValueProvider3D* m_pedalProvider = nullptr;
float m_idlePosition = 0;