2015-07-10 06:01:56 -07:00
|
|
|
/**
|
|
|
|
* @file electronic_throttle.cpp
|
2019-04-24 17:47:38 -07:00
|
|
|
* @brief Electronic Throttle driver
|
2015-07-10 06:01:56 -07:00
|
|
|
*
|
2020-02-22 20:18:02 -08:00
|
|
|
* @see test test_etb.cpp
|
|
|
|
*
|
2019-12-30 07:25:52 -08:00
|
|
|
*
|
|
|
|
* Limited user documentation at https://github.com/rusefi/rusefi_documentation/wiki/HOWTO_electronic_throttle_body
|
|
|
|
*
|
2015-07-10 06:01:56 -07:00
|
|
|
* todo: make this more universal if/when we get other hardware options
|
|
|
|
*
|
2019-09-07 19:16:56 -07:00
|
|
|
* Sep 2019 two-wire TLE9201 official driving around the block! https://www.youtube.com/watch?v=1vCeICQnbzI
|
2019-09-28 06:59:40 -07:00
|
|
|
* May 2019 two-wire TLE7209 now behaves same as three-wire VNH2SP30 "eBay red board" on BOSCH 0280750009
|
2019-04-24 17:47:38 -07:00
|
|
|
* Apr 2019 two-wire TLE7209 support added
|
2019-05-05 15:09:52 -07:00
|
|
|
* Mar 2019 best results so far achieved with three-wire H-bridges like VNH2SP30 on BOSCH 0280750009
|
2019-02-10 16:13:04 -08:00
|
|
|
* Jan 2019 actually driven around the block but still need some work.
|
2017-01-27 18:04:23 -08:00
|
|
|
* Jan 2017 status:
|
2017-05-25 09:09:07 -07:00
|
|
|
* Electronic throttle body with it's spring is definitely not linear - both P and I factors of PID are required to get any results
|
2017-01-27 18:04:23 -08:00
|
|
|
* PID implementation tested on a bench only
|
|
|
|
* it is believed that more than just PID would be needed, as is this is probably
|
|
|
|
* not usable on a real vehicle. Needs to be tested :)
|
|
|
|
*
|
2019-11-18 19:25:07 -08:00
|
|
|
* https://raw.githubusercontent.com/wiki/rusefi/rusefi_documentation/oem_docs/VAG/Bosch_0280750009_pinout.jpg
|
2017-05-25 09:09:07 -07:00
|
|
|
*
|
2017-05-24 20:53:07 -07:00
|
|
|
* ETB is controlled according to pedal position input (pedal position sensor is a potentiometer)
|
2019-02-10 16:52:06 -08:00
|
|
|
* pedal 0% means pedal not pressed / idle
|
2017-05-24 20:53:07 -07:00
|
|
|
* pedal 100% means pedal all the way down
|
2017-05-25 09:09:07 -07:00
|
|
|
* (not TPS - not the one you can calibrate in TunerStudio)
|
2017-05-24 20:53:07 -07:00
|
|
|
*
|
|
|
|
*
|
2017-05-25 09:09:07 -07:00
|
|
|
* See also pid.cpp
|
|
|
|
*
|
2017-05-29 20:36:08 -07:00
|
|
|
* Relevant console commands:
|
|
|
|
*
|
2019-02-27 05:55:56 -08:00
|
|
|
* ETB_BENCH_ENGINE
|
|
|
|
* set engine_type 58
|
|
|
|
*
|
2017-05-29 20:36:08 -07:00
|
|
|
* enable verbose_etb
|
|
|
|
* disable verbose_etb
|
|
|
|
* ethinfo
|
2018-01-30 19:04:33 -08:00
|
|
|
* set mock_pedal_position X
|
2017-05-24 20:53:07 -07:00
|
|
|
*
|
2018-12-01 13:41:40 -08:00
|
|
|
*
|
|
|
|
* set debug_mode 17
|
|
|
|
* for PID outputs
|
|
|
|
*
|
2019-03-01 20:09:33 -08:00
|
|
|
* set etb_p X
|
|
|
|
* set etb_i X
|
|
|
|
* set etb_d X
|
2019-04-23 20:18:48 -07:00
|
|
|
* set etb_o X
|
2019-03-01 20:09:33 -08:00
|
|
|
*
|
2019-09-21 19:15:34 -07:00
|
|
|
* set_etb_duty X
|
2019-03-01 20:09:33 -08:00
|
|
|
*
|
2017-01-27 18:04:23 -08:00
|
|
|
* http://rusefi.com/forum/viewtopic.php?f=5&t=592
|
|
|
|
*
|
2015-07-10 06:01:56 -07:00
|
|
|
* @date Dec 7, 2013
|
2020-01-13 18:57:43 -08:00
|
|
|
* @author Andrey Belomutskiy, (c) 2012-2020
|
2015-07-10 06:01:56 -07:00
|
|
|
*
|
|
|
|
* This file is part of rusEfi - see http://rusefi.com
|
|
|
|
*
|
|
|
|
* rusEfi is free software; you can redistribute it and/or modify it under the terms of
|
|
|
|
* the GNU General Public License as published by the Free Software Foundation; either
|
|
|
|
* version 3 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* rusEfi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
|
|
|
|
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along with this program.
|
|
|
|
* If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
2018-09-16 19:26:57 -07:00
|
|
|
#include "global.h"
|
2019-04-09 19:52:03 -07:00
|
|
|
|
2019-04-12 19:07:03 -07:00
|
|
|
#if EFI_ELECTRONIC_THROTTLE_BODY
|
2019-04-09 19:52:03 -07:00
|
|
|
|
2015-07-10 06:01:56 -07:00
|
|
|
#include "electronic_throttle.h"
|
|
|
|
#include "tps.h"
|
2020-04-01 17:21:03 -07:00
|
|
|
#include "sensor.h"
|
2019-03-29 06:11:13 -07:00
|
|
|
#include "dc_motor.h"
|
2020-03-03 14:56:50 -08:00
|
|
|
#include "dc_motors.h"
|
2017-09-21 20:21:03 -07:00
|
|
|
#include "pid_auto_tune.h"
|
2019-07-05 16:00:44 -07:00
|
|
|
|
|
|
|
#if defined(HAS_OS_ACCESS)
|
|
|
|
#error "Unexpected OS ACCESS HERE"
|
|
|
|
#endif
|
|
|
|
|
2019-11-21 10:35:57 -08:00
|
|
|
#ifndef ETB_MAX_COUNT
|
2019-07-05 16:00:44 -07:00
|
|
|
#define ETB_MAX_COUNT 2
|
2019-11-21 10:35:57 -08:00
|
|
|
#endif /* ETB_MAX_COUNT */
|
2019-07-05 16:00:44 -07:00
|
|
|
|
2018-11-22 20:42:30 -08:00
|
|
|
static pid_s tuneWorkingPidSettings;
|
|
|
|
static Pid tuneWorkingPid(&tuneWorkingPidSettings);
|
2017-09-21 20:21:03 -07:00
|
|
|
static PID_AutoTune autoTune;
|
|
|
|
|
2015-07-10 06:01:56 -07:00
|
|
|
static LoggingWithStorage logger("ETB");
|
2019-06-15 11:33:41 -07:00
|
|
|
static pedal2tps_t pedal2tpsMap("Pedal2Tps", 1);
|
2019-02-10 16:52:06 -08:00
|
|
|
|
2019-03-10 09:58:27 -07:00
|
|
|
EXTERN_ENGINE;
|
|
|
|
|
2019-09-22 20:28:11 -07:00
|
|
|
static bool startupPositionError = false;
|
|
|
|
|
2019-09-27 20:01:47 -07:00
|
|
|
#define STARTUP_NEUTRAL_POSITION_ERROR_THRESHOLD 5
|
2019-09-22 20:28:11 -07:00
|
|
|
|
2020-04-02 18:33:49 -07:00
|
|
|
static SensorType indexToTpsSensor(size_t index) {
|
|
|
|
switch(index) {
|
|
|
|
case 0: return SensorType::Tps1;
|
|
|
|
default: return SensorType::Tps2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-07-12 04:48:28 -07:00
|
|
|
static percent_t directPwmValue = NAN;
|
2017-09-21 20:21:03 -07:00
|
|
|
static percent_t currentEtbDuty;
|
2015-07-10 06:01:56 -07:00
|
|
|
|
2019-05-04 21:42:50 -07:00
|
|
|
#define ETB_DUTY_LIMIT 0.9
|
2019-07-12 04:48:28 -07:00
|
|
|
// this macro clamps both positive and negative percentages from about -100% to 100%
|
|
|
|
#define ETB_PERCENT_TO_DUTY(X) (maxF(minF((X * 0.01), ETB_DUTY_LIMIT - 0.01), 0.01 - ETB_DUTY_LIMIT))
|
2019-02-27 14:54:25 -08:00
|
|
|
|
2019-12-10 16:37:04 -08:00
|
|
|
void EtbController::init(DcMotor *motor, int ownIndex, pid_s *pidParameters) {
|
|
|
|
m_motor = motor;
|
|
|
|
m_myIndex = ownIndex;
|
|
|
|
m_pid.initPidClass(pidParameters);
|
|
|
|
}
|
|
|
|
|
|
|
|
void EtbController::reset() {
|
|
|
|
m_shouldResetPid = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void EtbController::onConfigurationChange(pid_s* previousConfiguration) {
|
2020-03-03 14:56:50 -08:00
|
|
|
if (m_motor && m_pid.isSame(previousConfiguration)) {
|
2019-12-10 16:37:04 -08:00
|
|
|
m_shouldResetPid = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void EtbController::showStatus(Logging* logger) {
|
|
|
|
m_pid.showPidStatus(logger, "ETB");
|
2019-11-22 17:53:54 -08:00
|
|
|
}
|
2019-11-20 21:49:38 -08:00
|
|
|
|
2019-11-22 17:53:54 -08:00
|
|
|
int EtbController::getPeriodMs() {
|
|
|
|
return GET_PERIOD_LIMITED(&engineConfiguration->etb);
|
|
|
|
}
|
2019-02-10 16:52:06 -08:00
|
|
|
|
2019-11-22 17:53:54 -08:00
|
|
|
void EtbController::PeriodicTask() {
|
2019-04-12 19:07:03 -07:00
|
|
|
#if EFI_TUNER_STUDIO
|
2019-12-10 16:37:04 -08:00
|
|
|
// Only debug throttle #0
|
|
|
|
if (m_myIndex == 0) {
|
|
|
|
// set debug_mode 17
|
|
|
|
if (engineConfiguration->debugMode == DBG_ELECTRONIC_THROTTLE_PID) {
|
|
|
|
m_pid.postState(&tsOutputChannels);
|
|
|
|
tsOutputChannels.debugIntField5 = engine->engineState.etbFeedForward;
|
|
|
|
} else if (engineConfiguration->debugMode == DBG_ELECTRONIC_THROTTLE_EXTRA) {
|
|
|
|
// set debug_mode 29
|
|
|
|
tsOutputChannels.debugFloatField1 = directPwmValue;
|
|
|
|
}
|
2019-11-22 17:53:54 -08:00
|
|
|
}
|
2019-12-10 16:37:04 -08:00
|
|
|
#endif /* EFI_TUNER_STUDIO */
|
2018-10-21 14:45:14 -07:00
|
|
|
|
2019-11-22 17:53:54 -08:00
|
|
|
if (!m_motor) {
|
|
|
|
return;
|
|
|
|
}
|
2019-09-22 20:28:11 -07:00
|
|
|
|
2019-11-22 17:53:54 -08:00
|
|
|
if (startupPositionError) {
|
2020-04-10 14:27:13 -07:00
|
|
|
m_motor->disable();
|
2019-11-22 17:53:54 -08:00
|
|
|
return;
|
|
|
|
}
|
2017-05-27 20:01:41 -07:00
|
|
|
|
2019-12-10 16:37:04 -08:00
|
|
|
if (m_shouldResetPid) {
|
|
|
|
m_pid.reset();
|
|
|
|
m_shouldResetPid = false;
|
2019-11-22 17:53:54 -08:00
|
|
|
}
|
2018-10-21 14:45:14 -07:00
|
|
|
|
2019-11-22 17:53:54 -08:00
|
|
|
if (!cisnan(directPwmValue)) {
|
|
|
|
m_motor->set(directPwmValue);
|
|
|
|
return;
|
|
|
|
}
|
2019-04-26 10:46:58 -07:00
|
|
|
|
2019-12-11 14:48:55 -08:00
|
|
|
if (engineConfiguration->pauseEtbControl) {
|
2020-04-10 14:27:13 -07:00
|
|
|
m_motor->disable();
|
2019-11-22 17:53:54 -08:00
|
|
|
return;
|
|
|
|
}
|
2018-11-22 20:06:06 -08:00
|
|
|
|
2020-04-01 17:21:03 -07:00
|
|
|
auto pedalPosition = Sensor::get(SensorType::AcceleratorPedal);
|
|
|
|
|
|
|
|
if (!pedalPosition.Valid) {
|
2020-04-10 14:27:13 -07:00
|
|
|
m_motor->disable();
|
2020-04-01 17:21:03 -07:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-04-02 18:33:49 -07:00
|
|
|
SensorResult actualThrottlePosition = Sensor::get(indexToTpsSensor(m_myIndex));
|
2020-04-01 17:21:03 -07:00
|
|
|
|
2020-04-02 18:33:49 -07:00
|
|
|
if (!actualThrottlePosition.Valid) {
|
2020-04-10 14:27:13 -07:00
|
|
|
m_motor->disable();
|
2020-04-02 18:33:49 -07:00
|
|
|
return;
|
|
|
|
}
|
2017-09-21 20:21:03 -07:00
|
|
|
|
2019-11-22 17:53:54 -08:00
|
|
|
if (engine->etbAutoTune) {
|
2020-04-02 18:33:49 -07:00
|
|
|
autoTune.input = actualThrottlePosition.Value;
|
2019-11-22 17:53:54 -08:00
|
|
|
bool result = autoTune.Runtime(&logger);
|
2017-09-21 20:21:03 -07:00
|
|
|
|
2019-11-22 17:53:54 -08:00
|
|
|
tuneWorkingPid.updateFactors(autoTune.output, 0, 0);
|
2018-11-22 20:42:30 -08:00
|
|
|
|
2020-04-02 18:33:49 -07:00
|
|
|
float value = tuneWorkingPid.getOutput(50, actualThrottlePosition.Value);
|
2019-11-22 17:53:54 -08:00
|
|
|
scheduleMsg(&logger, "AT input=%f output=%f PID=%f", autoTune.input,
|
|
|
|
autoTune.output,
|
|
|
|
value);
|
|
|
|
scheduleMsg(&logger, "AT PID=%f", value);
|
|
|
|
m_motor->set(ETB_PERCENT_TO_DUTY(value));
|
2018-11-22 20:54:11 -08:00
|
|
|
|
2019-11-22 17:53:54 -08:00
|
|
|
if (result) {
|
|
|
|
scheduleMsg(&logger, "GREAT NEWS! %f/%f/%f", autoTune.GetKp(), autoTune.GetKi(), autoTune.GetKd());
|
2017-09-21 20:21:03 -07:00
|
|
|
}
|
|
|
|
|
2019-11-22 17:53:54 -08:00
|
|
|
return;
|
|
|
|
}
|
2017-05-27 20:01:41 -07:00
|
|
|
|
2019-06-15 11:33:41 -07:00
|
|
|
|
2020-04-03 04:48:12 -07:00
|
|
|
float rpm = GET_RPM();
|
2020-04-01 17:21:03 -07:00
|
|
|
engine->engineState.targetFromTable = pedal2tpsMap.getValue(rpm / RPM_1_BYTE_PACKING_MULT, pedalPosition.Value);
|
2019-12-11 14:48:55 -08:00
|
|
|
percent_t etbIdleAddition = CONFIG(useETBforIdleControl) ? engine->engineState.idle.etbIdleAddition : 0;
|
2019-11-22 17:53:54 -08:00
|
|
|
percent_t targetPosition = engine->engineState.targetFromTable + etbIdleAddition;
|
|
|
|
|
|
|
|
if (engineConfiguration->debugMode == DBG_ETB_LOGIC) {
|
2019-06-15 11:33:41 -07:00
|
|
|
#if EFI_TUNER_STUDIO
|
2019-11-22 17:53:54 -08:00
|
|
|
tsOutputChannels.debugFloatField1 = engine->engineState.targetFromTable;
|
|
|
|
tsOutputChannels.debugFloatField2 = engine->engineState.idle.etbIdleAddition;
|
2019-06-15 11:33:41 -07:00
|
|
|
#endif /* EFI_TUNER_STUDIO */
|
2019-11-22 17:53:54 -08:00
|
|
|
}
|
2015-07-10 06:01:56 -07:00
|
|
|
|
2019-11-29 20:41:26 -08:00
|
|
|
if (cisnan(targetPosition)) {
|
|
|
|
// this could happen while changing settings
|
|
|
|
warning(CUSTOM_ERR_ETB_TARGET, "target");
|
|
|
|
return;
|
|
|
|
}
|
2019-11-22 17:53:54 -08:00
|
|
|
engine->engineState.etbFeedForward = interpolate2d("etbb", targetPosition, engineConfiguration->etbBiasBins, engineConfiguration->etbBiasValues);
|
2017-11-16 11:44:34 -08:00
|
|
|
|
2019-12-10 16:37:04 -08:00
|
|
|
m_pid.iTermMin = engineConfiguration->etb_iTermMin;
|
|
|
|
m_pid.iTermMax = engineConfiguration->etb_iTermMax;
|
2019-03-03 12:27:49 -08:00
|
|
|
|
2019-11-22 17:53:54 -08:00
|
|
|
currentEtbDuty = engine->engineState.etbFeedForward +
|
2020-04-02 18:33:49 -07:00
|
|
|
m_pid.getOutput(targetPosition, actualThrottlePosition.Value);
|
2015-07-10 06:01:56 -07:00
|
|
|
|
2020-04-10 14:27:13 -07:00
|
|
|
m_motor->enable();
|
2019-11-22 17:53:54 -08:00
|
|
|
m_motor->set(ETB_PERCENT_TO_DUTY(currentEtbDuty));
|
2019-05-04 21:42:50 -07:00
|
|
|
|
2019-11-22 17:53:54 -08:00
|
|
|
if (engineConfiguration->isVerboseETB) {
|
2019-12-10 16:37:04 -08:00
|
|
|
m_pid.showPidStatus(&logger, "ETB");
|
2019-11-22 17:53:54 -08:00
|
|
|
}
|
2019-06-26 16:24:32 -07:00
|
|
|
|
2019-11-22 17:53:54 -08:00
|
|
|
DISPLAY_STATE(Engine)
|
|
|
|
DISPLAY_TEXT(Electronic_Throttle);
|
|
|
|
DISPLAY_SENSOR(TPS)
|
|
|
|
DISPLAY_TEXT(eol);
|
|
|
|
|
|
|
|
DISPLAY_TEXT(Pedal);
|
|
|
|
DISPLAY_SENSOR(PPS);
|
|
|
|
DISPLAY(DISPLAY_CONFIG(throttlePedalPositionAdcChannel));
|
|
|
|
DISPLAY_TEXT(eol);
|
|
|
|
|
|
|
|
DISPLAY_TEXT(Feed_forward);
|
|
|
|
DISPLAY(DISPLAY_FIELD(etbFeedForward));
|
|
|
|
DISPLAY_TEXT(eol);
|
|
|
|
|
|
|
|
DISPLAY_STATE(ETB_pid)
|
|
|
|
DISPLAY_TEXT(input);
|
|
|
|
DISPLAY(DISPLAY_FIELD(input));
|
|
|
|
DISPLAY_TEXT(Output);
|
|
|
|
DISPLAY(DISPLAY_FIELD(output));
|
|
|
|
DISPLAY_TEXT(iTerm);
|
|
|
|
DISPLAY(DISPLAY_FIELD(iTerm));
|
|
|
|
DISPLAY_TEXT(eol);
|
|
|
|
DISPLAY(DISPLAY_FIELD(errorAmplificationCoef));
|
|
|
|
DISPLAY(DISPLAY_FIELD(previousError));
|
|
|
|
DISPLAY_TEXT(eol);
|
|
|
|
|
|
|
|
DISPLAY_TEXT(Settings);
|
|
|
|
DISPLAY(DISPLAY_CONFIG(ETB_PFACTOR));
|
|
|
|
DISPLAY(DISPLAY_CONFIG(ETB_IFACTOR));
|
|
|
|
DISPLAY(DISPLAY_CONFIG(ETB_DFACTOR));
|
|
|
|
DISPLAY_TEXT(eol);
|
|
|
|
DISPLAY(DISPLAY_CONFIG(ETB_OFFSET));
|
|
|
|
DISPLAY(DISPLAY_CONFIG(ETB_PERIODMS));
|
|
|
|
DISPLAY_TEXT(eol);
|
|
|
|
DISPLAY(DISPLAY_CONFIG(ETB_MINVALUE));
|
|
|
|
DISPLAY(DISPLAY_CONFIG(ETB_MAXVALUE));
|
2019-08-31 14:07:21 -07:00
|
|
|
/* DISPLAY_ELSE */
|
2019-11-22 17:53:54 -08:00
|
|
|
DISPLAY_TEXT(No_Pedal_Sensor);
|
2019-08-31 14:07:21 -07:00
|
|
|
/* DISPLAY_ENDIF */
|
2019-12-10 16:37:04 -08:00
|
|
|
|
|
|
|
// Only report the 0th throttle
|
|
|
|
if (m_myIndex == 0) {
|
2019-09-21 21:36:13 -07:00
|
|
|
#if EFI_TUNER_STUDIO
|
2019-12-10 16:37:04 -08:00
|
|
|
// 312
|
|
|
|
tsOutputChannels.etbTarget = targetPosition;
|
|
|
|
// 316
|
|
|
|
tsOutputChannels.etb1DutyCycle = currentEtbDuty;
|
|
|
|
// 320
|
|
|
|
// Error is positive if the throttle needs to open further
|
2020-04-02 18:33:49 -07:00
|
|
|
tsOutputChannels.etb1Error = targetPosition - actualThrottlePosition.Value;
|
2019-09-21 21:36:13 -07:00
|
|
|
#endif /* EFI_TUNER_STUDIO */
|
2019-12-10 16:37:04 -08:00
|
|
|
}
|
2019-11-22 17:53:54 -08:00
|
|
|
}
|
2019-02-10 16:52:06 -08:00
|
|
|
|
2019-12-13 10:52:34 -08:00
|
|
|
// real implementation (we mock for some unit tests)
|
|
|
|
EtbController etbControllers[ETB_COUNT];
|
2015-07-10 06:01:56 -07:00
|
|
|
|
|
|
|
static void showEthInfo(void) {
|
2019-11-19 23:18:17 -08:00
|
|
|
#if EFI_PROD_CODE
|
2019-12-13 09:50:34 -08:00
|
|
|
if (engine->etbActualCount == 0) {
|
2019-11-22 20:27:03 -08:00
|
|
|
scheduleMsg(&logger, "ETB DISABLED since no PPS");
|
|
|
|
}
|
|
|
|
|
2017-09-21 20:21:03 -07:00
|
|
|
scheduleMsg(&logger, "etbAutoTune=%d",
|
|
|
|
engine->etbAutoTune);
|
|
|
|
|
2020-04-05 06:11:25 -07:00
|
|
|
scheduleMsg(&logger, "TPS=%.2f", Sensor::get(SensorType::Tps1).value_or(0));
|
2019-11-20 21:49:38 -08:00
|
|
|
|
2015-07-10 06:01:56 -07:00
|
|
|
|
2018-01-23 09:05:14 -08:00
|
|
|
scheduleMsg(&logger, "etbControlPin1=%s duty=%.2f freq=%d",
|
2019-11-30 14:38:33 -08:00
|
|
|
hwPortname(CONFIG(etbIo[0].controlPin1)),
|
2017-05-29 20:36:08 -07:00
|
|
|
currentEtbDuty,
|
|
|
|
engineConfiguration->etbFreq);
|
2019-11-30 14:38:33 -08:00
|
|
|
scheduleMsg(&logger, "dir1=%s", hwPortname(CONFIG(etbIo[0].directionPin1)));
|
|
|
|
scheduleMsg(&logger, "dir2=%s", hwPortname(CONFIG(etbIo[0].directionPin2)));
|
2019-11-20 21:49:38 -08:00
|
|
|
|
2020-03-03 14:56:50 -08:00
|
|
|
showDcMotorInfo(&logger);
|
2019-11-20 21:49:38 -08:00
|
|
|
|
2019-11-19 23:18:17 -08:00
|
|
|
#endif /* EFI_PROD_CODE */
|
2015-07-10 06:01:56 -07:00
|
|
|
}
|
|
|
|
|
2019-12-13 09:50:34 -08:00
|
|
|
static void etbPidReset(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
|
|
|
for (int i = 0 ; i < engine->etbActualCount; i++) {
|
2019-12-13 10:52:34 -08:00
|
|
|
engine->etbControllers[i]->reset();
|
2019-11-28 12:24:30 -08:00
|
|
|
}
|
2019-11-27 19:07:36 -08:00
|
|
|
}
|
|
|
|
|
2019-12-13 09:50:34 -08:00
|
|
|
#if !EFI_UNIT_TEST
|
|
|
|
|
|
|
|
/**
|
|
|
|
* At the moment there are TWO ways to use this
|
|
|
|
* set_etb_duty X
|
|
|
|
* set etb X
|
|
|
|
* manual duty cycle control without PID. Percent value from 0 to 100
|
|
|
|
*/
|
|
|
|
void setThrottleDutyCycle(percent_t level) {
|
|
|
|
scheduleMsg(&logger, "setting ETB duty=%f%%", level);
|
|
|
|
if (cisnan(level)) {
|
|
|
|
directPwmValue = NAN;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
float dc = ETB_PERCENT_TO_DUTY(level);
|
|
|
|
directPwmValue = dc;
|
|
|
|
for (int i = 0 ; i < engine->etbActualCount; i++) {
|
2020-03-03 14:56:50 -08:00
|
|
|
setDcMotorDuty(i, dc);
|
2019-12-13 09:50:34 -08:00
|
|
|
}
|
|
|
|
scheduleMsg(&logger, "duty ETB duty=%f", dc);
|
|
|
|
}
|
2015-07-10 06:01:56 -07:00
|
|
|
|
2019-09-27 20:37:40 -07:00
|
|
|
static void setEtbFrequency(int frequency) {
|
|
|
|
engineConfiguration->etbFreq = frequency;
|
|
|
|
|
2019-12-13 09:50:34 -08:00
|
|
|
for (int i = 0 ; i < engine->etbActualCount; i++) {
|
2020-03-03 14:56:50 -08:00
|
|
|
setDcMotorFrequency(i, frequency);
|
2019-11-20 21:49:38 -08:00
|
|
|
}
|
2019-09-27 20:37:40 -07:00
|
|
|
}
|
|
|
|
|
2019-03-02 12:04:42 -08:00
|
|
|
static void etbReset() {
|
2019-03-09 20:31:47 -08:00
|
|
|
scheduleMsg(&logger, "etbReset");
|
2019-05-04 21:42:50 -07:00
|
|
|
|
2019-12-13 09:50:34 -08:00
|
|
|
for (int i = 0 ; i < engine->etbActualCount; i++) {
|
2020-03-03 14:56:50 -08:00
|
|
|
setDcMotorDuty(i, 0);
|
2019-11-20 21:49:38 -08:00
|
|
|
}
|
2019-12-10 16:37:04 -08:00
|
|
|
|
2019-11-27 19:07:36 -08:00
|
|
|
etbPidReset();
|
2019-03-02 12:04:42 -08:00
|
|
|
}
|
2019-11-19 23:18:17 -08:00
|
|
|
#endif /* EFI_PROD_CODE */
|
|
|
|
|
2019-11-20 05:46:54 -08:00
|
|
|
#if !EFI_UNIT_TEST
|
2019-11-19 23:18:17 -08:00
|
|
|
/**
|
|
|
|
* set etb_p X
|
|
|
|
*/
|
|
|
|
void setEtbPFactor(float value) {
|
|
|
|
engineConfiguration->etb.pFactor = value;
|
2019-11-27 19:07:36 -08:00
|
|
|
etbPidReset();
|
2019-11-19 23:18:17 -08:00
|
|
|
showEthInfo();
|
|
|
|
}
|
2019-03-02 12:04:42 -08:00
|
|
|
|
2019-03-01 20:09:33 -08:00
|
|
|
/**
|
|
|
|
* set etb_i X
|
|
|
|
*/
|
2017-01-06 14:01:28 -08:00
|
|
|
void setEtbIFactor(float value) {
|
2015-11-11 20:01:18 -08:00
|
|
|
engineConfiguration->etb.iFactor = value;
|
2019-11-27 19:07:36 -08:00
|
|
|
etbPidReset();
|
2018-09-24 20:57:03 -07:00
|
|
|
showEthInfo();
|
|
|
|
}
|
|
|
|
|
2019-03-01 20:09:33 -08:00
|
|
|
/**
|
|
|
|
* set etb_d X
|
|
|
|
*/
|
2018-09-24 20:57:03 -07:00
|
|
|
void setEtbDFactor(float value) {
|
|
|
|
engineConfiguration->etb.dFactor = value;
|
2019-11-27 19:07:36 -08:00
|
|
|
etbPidReset();
|
2018-11-26 19:17:16 -08:00
|
|
|
showEthInfo();
|
|
|
|
}
|
|
|
|
|
2019-03-03 12:27:49 -08:00
|
|
|
/**
|
|
|
|
* set etb_o X
|
|
|
|
*/
|
2018-11-26 19:17:16 -08:00
|
|
|
void setEtbOffset(int value) {
|
|
|
|
engineConfiguration->etb.offset = value;
|
2019-11-27 19:07:36 -08:00
|
|
|
etbPidReset();
|
2015-07-10 06:01:56 -07:00
|
|
|
showEthInfo();
|
|
|
|
}
|
|
|
|
|
2019-11-20 05:46:54 -08:00
|
|
|
#endif /* EFI_UNIT_TEST */
|
|
|
|
|
2020-04-10 05:12:16 -07:00
|
|
|
/**
|
|
|
|
* This specific throttle has default position of about 7% open
|
|
|
|
*/
|
|
|
|
static const float boschBiasBins[] = {
|
|
|
|
0, 1, 5, 7, 14, 65, 66, 100
|
|
|
|
};
|
|
|
|
static const float boschBiasValues[] = {
|
|
|
|
-15, -15, -10, 0, 19, 20, 26, 28
|
|
|
|
};
|
|
|
|
|
2019-09-21 21:16:46 -07:00
|
|
|
void setBoschVNH2SP30Curve(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
|
2020-04-10 05:12:16 -07:00
|
|
|
copyArray(CONFIG(etbBiasBins), boschBiasBins);
|
|
|
|
copyArray(CONFIG(etbBiasValues), boschBiasValues);
|
2019-08-31 17:17:17 -07:00
|
|
|
}
|
|
|
|
|
2019-09-21 21:16:46 -07:00
|
|
|
void setDefaultEtbParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
|
2019-06-15 10:33:14 -07:00
|
|
|
CONFIG(etbIdleThrottleRange) = 5;
|
|
|
|
|
2019-11-22 20:27:24 -08:00
|
|
|
setLinearCurve(config->pedalToTpsPedalBins, /*from*/0, /*to*/100, 1);
|
|
|
|
setLinearCurve(config->pedalToTpsRpmBins, /*from*/0, /*to*/8000 / RPM_1_BYTE_PACKING_MULT, 1);
|
2019-06-10 20:38:44 -07:00
|
|
|
|
2019-06-10 20:57:35 -07:00
|
|
|
for (int pedalIndex = 0;pedalIndex<PEDAL_TO_TPS_SIZE;pedalIndex++) {
|
|
|
|
for (int rpmIndex = 0;rpmIndex<PEDAL_TO_TPS_SIZE;rpmIndex++) {
|
|
|
|
config->pedalToTpsTable[pedalIndex][rpmIndex] = config->pedalToTpsPedalBins[pedalIndex];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-05-29 19:35:24 -07:00
|
|
|
engineConfiguration->throttlePedalUpVoltage = 0; // that's voltage, not ADC like with TPS
|
|
|
|
engineConfiguration->throttlePedalWOTVoltage = 6; // that's voltage, not ADC like with TPS
|
|
|
|
|
2020-04-10 05:12:16 -07:00
|
|
|
engineConfiguration->etb = {
|
|
|
|
1, // Kp
|
|
|
|
10, // Ki
|
|
|
|
0.05, // Kd
|
|
|
|
0, // offset
|
|
|
|
(1000 / DEFAULT_ETB_LOOP_FREQUENCY),
|
|
|
|
-100, 100 // min/max
|
|
|
|
};
|
|
|
|
|
2019-03-02 11:00:32 -08:00
|
|
|
engineConfiguration->etb_iTermMin = -300;
|
|
|
|
engineConfiguration->etb_iTermMax = 300;
|
2015-07-10 06:01:56 -07:00
|
|
|
}
|
|
|
|
|
2017-05-27 20:01:41 -07:00
|
|
|
void onConfigurationChangeElectronicThrottleCallback(engine_configuration_s *previousConfiguration) {
|
2019-12-10 16:37:04 -08:00
|
|
|
for (int i = 0; i < ETB_COUNT; i++) {
|
2019-12-13 10:52:34 -08:00
|
|
|
etbControllers[i].onConfigurationChange(&previousConfiguration->etb);
|
2019-11-28 12:24:30 -08:00
|
|
|
}
|
2017-05-27 20:01:41 -07:00
|
|
|
}
|
|
|
|
|
2019-11-05 17:07:55 -08:00
|
|
|
#if EFI_PROD_CODE && 0
|
2017-09-21 20:21:03 -07:00
|
|
|
static void setTempOutput(float value) {
|
|
|
|
autoTune.output = value;
|
|
|
|
}
|
|
|
|
|
2018-11-25 20:13:03 -08:00
|
|
|
/**
|
|
|
|
* set_etbat_step X
|
|
|
|
*/
|
|
|
|
static void setAutoStep(float value) {
|
|
|
|
autoTune.reset();
|
2018-11-22 20:06:06 -08:00
|
|
|
autoTune.SetOutputStep(value);
|
2017-09-21 20:21:03 -07:00
|
|
|
}
|
|
|
|
|
2018-11-25 20:13:03 -08:00
|
|
|
static void setAutoPeriod(int period) {
|
2019-02-10 19:47:49 -08:00
|
|
|
tuneWorkingPidSettings.periodMs = period;
|
2018-11-25 20:13:03 -08:00
|
|
|
autoTune.reset();
|
|
|
|
}
|
|
|
|
|
2018-11-26 18:40:41 -08:00
|
|
|
static void setAutoOffset(int offset) {
|
|
|
|
tuneWorkingPidSettings.offset = offset;
|
|
|
|
autoTune.reset();
|
|
|
|
}
|
2019-11-19 23:18:17 -08:00
|
|
|
#endif /* EFI_PROD_CODE */
|
2018-11-26 18:40:41 -08:00
|
|
|
|
2020-04-10 05:12:16 -07:00
|
|
|
static const float defaultBiasBins[] = {
|
|
|
|
0, 1, 2, 4, 7, 98, 99, 100
|
|
|
|
};
|
|
|
|
static const float defaultBiasValues[] = {
|
|
|
|
-20, -18, -17, 0, 20, 21, 22, 25
|
|
|
|
};
|
|
|
|
|
2019-09-21 21:16:46 -07:00
|
|
|
void setDefaultEtbBiasCurve(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
|
2020-04-10 05:12:16 -07:00
|
|
|
copyArray(CONFIG(etbBiasBins), defaultBiasBins);
|
|
|
|
copyArray(CONFIG(etbBiasValues), defaultBiasValues);
|
2018-12-09 10:50:13 -08:00
|
|
|
}
|
|
|
|
|
2019-03-10 09:58:27 -07:00
|
|
|
void unregisterEtbPins() {
|
2019-12-13 10:52:34 -08:00
|
|
|
// todo: we probably need an implementation here?!
|
2019-03-10 09:58:27 -07:00
|
|
|
}
|
|
|
|
|
2020-04-01 21:37:02 -07:00
|
|
|
void doInitElectronicThrottle(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
2019-12-13 10:52:34 -08:00
|
|
|
efiAssertVoid(OBD_PCM_Processor_Fault, engine->etbControllers != NULL, "etbControllers NULL");
|
2019-09-21 21:36:13 -07:00
|
|
|
#if EFI_PROD_CODE
|
2017-05-29 19:08:55 -07:00
|
|
|
addConsoleAction("ethinfo", showEthInfo);
|
2019-03-02 12:04:42 -08:00
|
|
|
addConsoleAction("etbreset", etbReset);
|
2019-09-27 20:37:40 -07:00
|
|
|
addConsoleActionI("etb_freq", setEtbFrequency);
|
2019-09-21 21:36:13 -07:00
|
|
|
#endif /* EFI_PROD_CODE */
|
2019-09-21 21:16:46 -07:00
|
|
|
|
2020-04-02 05:04:12 -07:00
|
|
|
// If you don't have a pedal, we have no business here.
|
|
|
|
if (!Sensor::hasSensor(SensorType::AcceleratorPedal)) {
|
2017-03-19 18:44:52 -07:00
|
|
|
return;
|
|
|
|
}
|
2020-04-02 05:04:12 -07:00
|
|
|
|
2020-04-05 06:11:25 -07:00
|
|
|
engine->etbActualCount = Sensor::hasSensor(SensorType::Tps2) ? 2 : 1;
|
2019-12-13 09:50:34 -08:00
|
|
|
|
2020-03-03 14:56:50 -08:00
|
|
|
for (int i = 0 ; i < engine->etbActualCount; i++) {
|
|
|
|
auto motor = initDcMotor(i PASS_ENGINE_PARAMETER_SUFFIX);
|
|
|
|
|
|
|
|
// If this motor is actually set up, init the etb
|
|
|
|
if (motor)
|
|
|
|
{
|
|
|
|
engine->etbControllers[i]->init(motor, i, &engineConfiguration->etb);
|
|
|
|
INJECT_ENGINE_REFERENCE(engine->etbControllers[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pedal2tpsMap.init(config->pedalToTpsTable, config->pedalToTpsPedalBins, config->pedalToTpsRpmBins);
|
|
|
|
|
2019-09-29 11:00:04 -07:00
|
|
|
#if 0
|
|
|
|
// not alive code
|
2018-11-25 20:13:03 -08:00
|
|
|
autoTune.SetOutputStep(0.1);
|
2019-09-29 11:00:04 -07:00
|
|
|
#endif
|
2017-03-19 18:44:52 -07:00
|
|
|
|
2019-09-29 11:00:04 -07:00
|
|
|
#if 0 && ! EFI_UNIT_TEST
|
2019-09-22 20:28:11 -07:00
|
|
|
percent_t startupThrottlePosition = getTPS(PASS_ENGINE_PARAMETER_SIGNATURE);
|
|
|
|
if (absF(startupThrottlePosition - engineConfiguration->etbNeutralPosition) > STARTUP_NEUTRAL_POSITION_ERROR_THRESHOLD) {
|
|
|
|
/**
|
2020-03-28 17:56:58 -07:00
|
|
|
* Unexpected electronic throttle start-up position is worth a critical error
|
2019-09-22 20:28:11 -07:00
|
|
|
*/
|
|
|
|
firmwareError(OBD_Throttle_Actuator_Control_Range_Performance_Bank_1, "startup ETB position %.2f not %d",
|
|
|
|
startupThrottlePosition,
|
|
|
|
engineConfiguration->etbNeutralPosition);
|
|
|
|
startupPositionError = true;
|
|
|
|
}
|
2019-09-22 21:41:35 -07:00
|
|
|
#endif /* EFI_UNIT_TEST */
|
2019-09-22 20:28:11 -07:00
|
|
|
|
2019-09-29 11:22:51 -07:00
|
|
|
#if EFI_PROD_CODE
|
2019-09-29 11:00:04 -07:00
|
|
|
if (engineConfiguration->etbCalibrationOnStart) {
|
2019-11-20 21:49:38 -08:00
|
|
|
|
2019-12-13 09:50:34 -08:00
|
|
|
for (int i = 0 ; i < engine->etbActualCount; i++) {
|
2020-03-03 14:56:50 -08:00
|
|
|
setDcMotorDuty(i, 70);
|
2019-11-20 21:49:38 -08:00
|
|
|
chThdSleep(600);
|
|
|
|
// todo: grab with proper index
|
|
|
|
grabTPSIsWideOpen();
|
2020-03-03 14:56:50 -08:00
|
|
|
setDcMotorDuty(i, -70);
|
2019-11-20 21:49:38 -08:00
|
|
|
chThdSleep(600);
|
|
|
|
// todo: grab with proper index
|
|
|
|
grabTPSIsClosed();
|
|
|
|
}
|
2019-09-29 11:00:04 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
// manual duty cycle control without PID. Percent value from 0 to 100
|
|
|
|
addConsoleActionNANF(CMD_ETB_DUTY, setThrottleDutyCycle);
|
2019-11-19 23:18:17 -08:00
|
|
|
#endif /* EFI_PROD_CODE */
|
2019-09-29 11:00:04 -07:00
|
|
|
|
|
|
|
#if EFI_PROD_CODE && 0
|
2018-11-22 20:42:30 -08:00
|
|
|
tuneWorkingPidSettings.pFactor = 1;
|
|
|
|
tuneWorkingPidSettings.iFactor = 0;
|
|
|
|
tuneWorkingPidSettings.dFactor = 0;
|
2018-11-25 20:13:03 -08:00
|
|
|
// tuneWorkingPidSettings.offset = 10; // todo: not hard-coded value
|
2019-02-10 19:47:49 -08:00
|
|
|
//todo tuneWorkingPidSettings.periodMs = 10;
|
2018-11-22 20:42:30 -08:00
|
|
|
tuneWorkingPidSettings.minValue = 0;
|
|
|
|
tuneWorkingPidSettings.maxValue = 100;
|
2019-02-10 19:47:49 -08:00
|
|
|
tuneWorkingPidSettings.periodMs = 100;
|
2018-11-22 20:42:30 -08:00
|
|
|
|
2019-03-01 20:09:33 -08:00
|
|
|
// this is useful once you do "enable etb_auto"
|
2018-11-25 20:13:03 -08:00
|
|
|
addConsoleActionF("set_etbat_output", setTempOutput);
|
|
|
|
addConsoleActionF("set_etbat_step", setAutoStep);
|
|
|
|
addConsoleActionI("set_etbat_period", setAutoPeriod);
|
2018-11-26 18:40:41 -08:00
|
|
|
addConsoleActionI("set_etbat_offset", setAutoOffset);
|
2019-09-21 21:36:13 -07:00
|
|
|
#endif /* EFI_PROD_CODE */
|
2015-07-10 06:01:56 -07:00
|
|
|
|
2019-12-13 09:50:34 -08:00
|
|
|
etbPidReset(PASS_ENGINE_PARAMETER_SIGNATURE);
|
2015-07-10 06:01:56 -07:00
|
|
|
|
2019-12-13 09:50:34 -08:00
|
|
|
for (int i = 0 ; i < engine->etbActualCount; i++) {
|
2019-12-13 10:52:34 -08:00
|
|
|
engine->etbControllers[i]->Start();
|
2019-11-28 12:24:30 -08:00
|
|
|
}
|
2015-07-10 06:01:56 -07:00
|
|
|
}
|
|
|
|
|
2020-04-01 21:32:03 -07:00
|
|
|
void initElectronicThrottle(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
|
|
|
if (hasFirmwareError()) {
|
2020-04-02 05:04:12 -07:00
|
|
|
return;
|
2020-04-01 21:32:03 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < ETB_COUNT; i++) {
|
|
|
|
engine->etbControllers[i] = &etbControllers[i];
|
|
|
|
}
|
2020-04-02 05:04:12 -07:00
|
|
|
|
2020-04-01 21:32:03 -07:00
|
|
|
doInitElectronicThrottle(PASS_ENGINE_PARAMETER_SIGNATURE);
|
|
|
|
}
|
|
|
|
|
2015-07-10 06:01:56 -07:00
|
|
|
#endif /* EFI_ELECTRONIC_THROTTLE_BODY */
|