rusefi-1/firmware/controllers/algo/accel_enrichment.cpp

292 lines
8.3 KiB
C++
Raw Normal View History

2015-07-10 06:01:56 -07:00
/**
* @file accel_enrichment.cpp
* @brief Acceleration enrichment calculator
*
2015-08-21 12:01:36 -07:00
* In this file we have three strategies for acceleration/deceleration fuel correction
*
* 1) MAP rate-of-change correction
* 2) TPS rate-of-change correction
* 3) fuel film/wal wetting correction
* AWC Added to Wall Coefficient, %
* AWA Added to Wall Amount
* SOC Sucked Off wall Coefficient, %
* SOA Sucked Off wall amount
* WF current on-Wall Fuel amount
*
*
* http://rusefi.com/wiki/index.php?title=Manual:Software:Fuel_Control
2015-07-10 06:01:56 -07:00
* @date Apr 21, 2014
* @author Dmitry Sidin
2018-01-20 17:55:31 -08:00
* @author Andrey Belomutskiy, (c) 2012-2018
2015-07-10 06:01:56 -07:00
*/
2018-09-16 19:26:57 -07:00
#include "global.h"
2015-07-10 06:01:56 -07:00
#include "trigger_central.h"
#include "accel_enrichment.h"
#include "engine_state.h"
#include "engine_math.h"
#include "signal_executor.h"
2016-03-12 17:03:40 -08:00
#if !EFI_UNIT_TEST || defined(__DOXYGEN__)
2016-03-11 08:03:18 -08:00
#include "tunerstudio_configuration.h"
extern TunerStudioOutputChannels tsOutputChannels;
2017-03-26 14:54:37 -07:00
#endif /* EFI_UNIT_TEST */
2015-07-10 06:01:56 -07:00
EXTERN_ENGINE
;
2016-03-11 08:03:18 -08:00
tps_tps_Map3D_t tpsTpsMap("tpsTps");
2016-01-31 14:01:29 -08:00
static Logging *logger = NULL;
2015-07-10 06:01:56 -07:00
2015-08-21 12:01:36 -07:00
WallFuel::WallFuel() {
2015-09-03 06:01:31 -07:00
reset();
2015-08-21 12:01:36 -07:00
}
2015-09-02 18:03:43 -07:00
void WallFuel::reset() {
2015-09-03 06:01:31 -07:00
memset(wallFuel, 0, sizeof(wallFuel));
2015-09-02 18:03:43 -07:00
}
2017-05-15 20:28:49 -07:00
floatms_t WallFuel::adjust(int injectorIndex, floatms_t target DECLARE_ENGINE_PARAMETER_SUFFIX) {
2015-08-23 22:01:28 -07:00
if (cisnan(target)) {
return target;
}
// disable this correction for cranking
if (ENGINE(rpmCalculator).isCranking(PASS_ENGINE_PARAMETER_SIGNATURE)) {
return target;
}
2016-01-31 08:01:43 -08:00
float addedToWallCoef = CONFIG(addedToWallCoef);
2015-08-21 12:01:36 -07:00
2016-01-31 08:01:43 -08:00
/**
* What amount of fuel is sucked of the walls, based on current amount of fuel on the wall.
*/
floatms_t suckedOffWallsAmount = wallFuel[injectorIndex] * CONFIG(suckedOffCoef);
2015-08-21 12:01:36 -07:00
2016-01-31 08:01:43 -08:00
floatms_t adjustedFuelPulse = (target - suckedOffWallsAmount) / (1 - addedToWallCoef);
2015-08-21 12:01:36 -07:00
// We can't inject a negative amount of fuel
// If this goes below zero we will be over-fueling slightly,
// but that's ok.
if(adjustedFuelPulse < 0) {
adjustedFuelPulse = 0;
}
2016-01-31 08:01:43 -08:00
float addedToWallsAmount = adjustedFuelPulse * addedToWallCoef;
wallFuel[injectorIndex] += addedToWallsAmount - suckedOffWallsAmount;
engine->wallFuelCorrection = adjustedFuelPulse - target;
return adjustedFuelPulse;
2015-08-21 12:01:36 -07:00
}
2015-08-23 20:02:37 -07:00
floatms_t WallFuel::getWallFuel(int injectorIndex) {
return wallFuel[injectorIndex];
2015-08-23 18:03:42 -07:00
}
2017-05-15 20:28:49 -07:00
int AccelEnrichmemnt::getMaxDeltaIndex(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
2016-03-09 21:04:40 -08:00
int len = minI(cb.getSize(), cb.getCount());
if (len < 2)
return 0;
2016-03-10 19:02:54 -08:00
int ci = cb.currentIndex - 1;
float maxValue = cb.get(ci) - cb.get(ci - 1);
int resultIndex = ci;
// todo: 'get' method is maybe a bit heavy because of the branching
// todo: this could be optimized with some careful magic
2016-03-09 21:04:40 -08:00
2016-03-10 19:02:54 -08:00
for (int i = 1; i<len - 1;i++) {
float v = cb.get(ci - i) - cb.get(ci - i - 1);
2016-03-09 21:04:40 -08:00
if (v > maxValue) {
maxValue = v;
2016-03-10 19:02:54 -08:00
resultIndex = ci - i;
2016-03-09 21:04:40 -08:00
}
}
2016-03-10 19:02:54 -08:00
return resultIndex;
}
2017-05-15 20:28:49 -07:00
float AccelEnrichmemnt::getMaxDelta(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
int index = getMaxDeltaIndex(PASS_ENGINE_PARAMETER_SIGNATURE);
2016-03-10 19:02:54 -08:00
2016-11-30 18:06:24 -08:00
return (cb.get(index) - (cb.get(index - 1))) * CONFIG(specs.cylindersCount);
2015-07-10 06:01:56 -07:00
}
2016-01-02 13:01:27 -08:00
// todo: eliminate code duplication between these two methods! Some pointer magic would help.
2017-05-15 20:28:49 -07:00
floatms_t AccelEnrichmemnt::getTpsEnrichment(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
int index = getMaxDeltaIndex(PASS_ENGINE_PARAMETER_SIGNATURE);
2016-03-11 08:03:18 -08:00
// FuelSchedule *fs = engine->engineConfiguration2->injectionEvents;
float tpsTo = cb.get(index);
float tpsFrom = cb.get(index - 1);
float d = tpsTo - tpsFrom;
2016-09-17 16:02:34 -07:00
float valueFromTable = tpsTpsMap.getValue(tpsFrom, tpsTo);
2016-03-11 08:03:18 -08:00
2016-03-12 17:03:40 -08:00
floatms_t extraFuel;
2016-03-11 11:03:23 -08:00
if (d > engineConfiguration->tpsAccelEnrichmentThreshold) {
2016-09-17 16:02:34 -07:00
extraFuel = valueFromTable;
2016-03-11 11:03:23 -08:00
} else if (d < -engineConfiguration->tpsDecelEnleanmentThreshold) {
2016-03-12 17:03:40 -08:00
extraFuel = d * engineConfiguration->tpsDecelEnleanmentMultiplier;
2016-03-11 11:03:23 -08:00
} else {
2016-03-12 17:03:40 -08:00
extraFuel = 0;
2016-03-11 11:03:23 -08:00
}
2016-03-12 17:03:40 -08:00
#if !EFI_UNIT_TEST || defined(__DOXYGEN__)
2016-03-11 08:03:18 -08:00
if (engineConfiguration->debugMode == DBG_TPS_ACCEL) {
tsOutputChannels.debugFloatField1 = tpsFrom;
tsOutputChannels.debugFloatField2 = tpsTo;
2016-09-17 16:02:34 -07:00
tsOutputChannels.debugFloatField3 = valueFromTable;
2016-03-12 17:03:40 -08:00
tsOutputChannels.debugFloatField4 = extraFuel;
2016-03-11 08:03:18 -08:00
}
#endif
2016-03-11 11:03:23 -08:00
2016-03-12 17:03:40 -08:00
return extraFuel;
2015-07-10 06:01:56 -07:00
}
2017-05-15 20:28:49 -07:00
float AccelEnrichmemnt::getEngineLoadEnrichment(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
int index = getMaxDeltaIndex(PASS_ENGINE_PARAMETER_SIGNATURE);
2016-03-12 17:03:40 -08:00
2016-11-30 18:06:24 -08:00
float d = (cb.get(index) - (cb.get(index - 1))) * CONFIG(specs.cylindersCount);
2016-03-12 17:03:40 -08:00
float result = 0;
int distance = 0;
float taper = 0;
2015-12-31 10:02:19 -08:00
if (d > engineConfiguration->engineLoadAccelEnrichmentThreshold) {
2016-03-12 17:03:40 -08:00
int distance = cb.currentIndex - index;
if (distance <= 0) // checking if indexes are out of order due to circular buffer nature
distance += minI(cb.getCount(), cb.getSize());
2017-05-29 08:31:07 -07:00
taper = interpolate2d("accel", distance, engineConfiguration->mapAccelTaperBins, engineConfiguration->mapAccelTaperMult, MAP_ACCEL_TAPER);
2016-03-12 17:03:40 -08:00
result = taper * d * engineConfiguration->engineLoadAccelEnrichmentMultiplier;
} else if (d < -engineConfiguration->engineLoadDecelEnleanmentThreshold) {
result = d * engineConfiguration->engineLoadAccelEnrichmentMultiplier;
2015-07-10 06:01:56 -07:00
}
2016-03-12 17:03:40 -08:00
#if ! EFI_UNIT_TEST || defined(__DOXYGEN__)
if (engineConfiguration->debugMode == DBG_EL_ACCEL) {
tsOutputChannels.debugIntField1 = distance;
tsOutputChannels.debugFloatField1 = result;
tsOutputChannels.debugFloatField2 = taper;
2016-01-02 13:01:27 -08:00
}
2016-03-12 17:03:40 -08:00
#endif
return result;
2015-07-10 06:01:56 -07:00
}
void AccelEnrichmemnt::reset() {
2016-01-04 21:02:56 -08:00
cb.clear();
2016-01-31 10:03:08 -08:00
previousValue = NAN;
2015-07-10 06:01:56 -07:00
}
2016-03-09 20:02:39 -08:00
void AccelEnrichmemnt::setLength(int length) {
cb.setSize(length);
}
2017-05-15 20:28:49 -07:00
void AccelEnrichmemnt::onNewValue(float currentValue DECLARE_ENGINE_PARAMETER_SUFFIX) {
2016-03-09 21:04:40 -08:00
cb.add(currentValue);
2015-07-10 06:01:56 -07:00
}
2017-05-15 20:28:49 -07:00
void AccelEnrichmemnt::onEngineCycleTps(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
onNewValue(getTPS(PASS_ENGINE_PARAMETER_SIGNATURE) PASS_ENGINE_PARAMETER_SUFFIX);
2015-07-10 06:01:56 -07:00
}
2017-05-15 20:28:49 -07:00
void AccelEnrichmemnt::onEngineCycle(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
onNewValue(getEngineLoadT(PASS_ENGINE_PARAMETER_SIGNATURE) PASS_ENGINE_PARAMETER_SUFFIX);
2015-07-10 06:01:56 -07:00
}
AccelEnrichmemnt::AccelEnrichmemnt() {
reset();
cb.setSize(4);
}
#if ! EFI_UNIT_TEST || defined(__DOXYGEN__)
static void accelInfo() {
2016-01-31 14:01:29 -08:00
if (logger == NULL)
return;
2015-12-31 15:02:17 -08:00
// scheduleMsg(logger, "EL accel length=%d", mapInstance.cb.getSize());
2018-01-23 09:05:14 -08:00
scheduleMsg(logger, "EL accel th=%.2f/mult=%.2f", engineConfiguration->engineLoadAccelEnrichmentThreshold, engineConfiguration->engineLoadAccelEnrichmentMultiplier);
scheduleMsg(logger, "EL decel th=%.2f/mult=%.2f", engineConfiguration->engineLoadDecelEnleanmentThreshold, engineConfiguration->engineLoadDecelEnleanmentMultiplier);
2015-07-10 06:01:56 -07:00
// scheduleMsg(logger, "TPS accel length=%d", tpsInstance.cb.getSize());
2018-01-23 09:05:14 -08:00
scheduleMsg(logger, "TPS accel th=%.2f/mult=%.2f", engineConfiguration->tpsAccelEnrichmentThreshold, -1);
2015-08-23 22:01:28 -07:00
2018-01-23 09:05:14 -08:00
scheduleMsg(logger, "added to wall=%.2f/sucked=%.2f", engineConfiguration->addedToWallCoef, engineConfiguration->suckedOffCoef);
2015-07-10 06:01:56 -07:00
}
2015-12-31 15:02:17 -08:00
void setEngineLoadAccelThr(float value) {
2015-12-31 10:02:19 -08:00
engineConfiguration->engineLoadAccelEnrichmentThreshold = value;
2015-07-10 06:01:56 -07:00
accelInfo();
}
2015-12-31 15:02:17 -08:00
void setEngineLoadAccelMult(float value) {
2015-12-31 10:02:19 -08:00
engineConfiguration->engineLoadAccelEnrichmentMultiplier = value;
2015-07-10 06:01:56 -07:00
accelInfo();
}
2017-01-06 07:04:41 -08:00
void setTpsAccelThr(float value) {
2015-07-10 06:01:56 -07:00
engineConfiguration->tpsAccelEnrichmentThreshold = value;
accelInfo();
}
2017-01-06 07:04:41 -08:00
void setTpsDecelThr(float value) {
2015-12-31 15:02:17 -08:00
engineConfiguration->tpsDecelEnleanmentThreshold = value;
accelInfo();
}
2017-01-06 07:04:41 -08:00
void setTpsDecelMult(float value) {
2015-12-31 15:02:17 -08:00
engineConfiguration->tpsDecelEnleanmentMultiplier = value;
accelInfo();
}
2017-01-06 07:04:41 -08:00
void setDecelThr(float value) {
2015-12-31 15:02:17 -08:00
engineConfiguration->engineLoadDecelEnleanmentThreshold = value;
2015-07-10 06:01:56 -07:00
accelInfo();
}
2017-01-06 07:04:41 -08:00
void setDecelMult(float value) {
2015-12-31 15:02:17 -08:00
engineConfiguration->engineLoadDecelEnleanmentMultiplier = value;
2015-07-10 06:01:56 -07:00
accelInfo();
}
2017-01-06 07:04:41 -08:00
void setTpsAccelLen(int length) {
2016-03-09 20:02:39 -08:00
if (length < 1) {
2015-09-02 17:01:29 -07:00
scheduleMsg(logger, "Length should be positive");
2015-07-10 06:01:56 -07:00
return;
}
2016-03-09 20:02:39 -08:00
engine->tpsAccelEnrichment.setLength(length);
2015-07-10 06:01:56 -07:00
accelInfo();
}
2016-03-09 20:02:39 -08:00
void setEngineLoadAccelLen(int length) {
if (length < 1) {
2015-09-02 17:01:29 -07:00
scheduleMsg(logger, "Length should be positive");
2015-07-10 06:01:56 -07:00
return;
}
2016-03-09 20:02:39 -08:00
engine->engineLoadAccelEnrichment.setLength(length);
2015-07-10 06:01:56 -07:00
accelInfo();
}
2016-01-31 12:01:41 -08:00
void updateAccelParameters() {
setEngineLoadAccelLen(engineConfiguration->engineLoadAccelLength);
setTpsAccelLen(engineConfiguration->tpsAccelLength);
}
2016-03-11 08:03:18 -08:00
#endif /* ! EFI_UNIT_TEST */
2017-05-15 20:28:49 -07:00
void initAccelEnrichment(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
2015-07-10 06:01:56 -07:00
logger = sharedLogger;
2016-03-11 08:03:18 -08:00
tpsTpsMap.init(config->tpsTpsAccelTable, config->tpsTpsAccelFromRpmBins, config->tpsTpsAccelToRpmBins);
#if ! EFI_UNIT_TEST || defined(__DOXYGEN__)
2017-01-06 13:03:41 -08:00
2015-07-10 06:01:56 -07:00
addConsoleAction("accelinfo", accelInfo);
2016-01-31 12:01:41 -08:00
updateAccelParameters();
2015-07-10 06:01:56 -07:00
#endif /* ! EFI_UNIT_TEST */
2016-03-11 08:03:18 -08:00
}