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

Fix advance corrections for cranking (#547)

This commit is contained in:
andreika-git 2018-01-23 06:47:58 +02:00 committed by rusefi
parent 153a1716e2
commit 66d7c2bd5d
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
firmware/controllers/algo/advance_map.cpp
View File

@ -83,6 +83,21 @@ static angle_t getRunningAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAME
return engineConfiguration->step1timing; return engineConfiguration->step1timing;
} }
float advanceAngle = advanceMap.getValue((float) rpm, engineLoad);
// get advance from the separate table for Idle
if (CONFIG(useSeparateAdvanceForIdle)) {
float idleAdvance = interpolate2d("idleAdvance", rpm, config->idleAdvanceBins, config->idleAdvance, IDLE_ADVANCE_CURVE_SIZE);
// interpolate between idle table and normal (running) table using TPS threshold
float tps = getTPS(PASS_ENGINE_PARAMETER_SIGNATURE);
advanceAngle = interpolateClamped(0.0f, idleAdvance, boardConfiguration->idlePidDeactivationTpsThreshold, advanceAngle, tps);
}
engine->m.advanceLookupTime = GET_TIMESTAMP() - engine->m.beforeAdvance;
return advanceAngle;
}
static angle_t getAdvanceCorrections(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX) {
float iatCorrection; float iatCorrection;
if (cisnan(engine->sensors.iat)) { if (cisnan(engine->sensors.iat)) {
iatCorrection = 0; iatCorrection = 0;
@ -96,26 +111,12 @@ static angle_t getRunningAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAME
tsOutputChannels.debugFloatField3 = engine->fsioTimingAdjustment; tsOutputChannels.debugFloatField3 = engine->fsioTimingAdjustment;
#endif #endif
} }
float advanceAngle = advanceMap.getValue((float) rpm, engineLoad);
// get advance from the separate table for Idle return iatCorrection
if (CONFIG(useSeparateAdvanceForIdle)) { + engine->fsioTimingAdjustment
float idleAdvance = interpolate2d("idleAdvance", rpm, config->idleAdvanceBins, config->idleAdvance, IDLE_ADVANCE_CURVE_SIZE); + engine->engineState.cltTimingCorrection
// interpolate between idle table and normal (running) table using TPS threshold // todo: uncomment once we get useable knock - engine->knockCount
float tps = getTPS(PASS_ENGINE_PARAMETER_SIGNATURE); ;
advanceAngle = interpolateClamped(0.0f, idleAdvance, boardConfiguration->idlePidDeactivationTpsThreshold, advanceAngle, tps);
}
float result = advanceAngle
+ iatCorrection
+ engine->fsioTimingAdjustment
+ engine->engineState.cltTimingCorrection
// todo: uncomment once we get useable knock - engine->knockCount
;
engine->m.advanceLookupTime = GET_TIMESTAMP() - engine->m.beforeAdvance;
return result;
} }
angle_t getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_SUFFIX) { angle_t getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_SUFFIX) {
@ -133,6 +134,7 @@ angle_t getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_SUFFIX) {
} else { } else {
angle = getRunningAdvance(rpm, engineLoad PASS_ENGINE_PARAMETER_SUFFIX); angle = getRunningAdvance(rpm, engineLoad PASS_ENGINE_PARAMETER_SUFFIX);
} }
angle += getAdvanceCorrections(rpm PASS_ENGINE_PARAMETER_SUFFIX);
angle -= engineConfiguration->ignitionOffset; angle -= engineConfiguration->ignitionOffset;
fixAngle(angle, "getAdvance"); fixAngle(angle, "getAdvance");
return angle; return angle;