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

better state validation

This commit is contained in:
rusefi 2018-10-07 14:22:05 -04:00
parent 68532840af
commit d49954f9c1
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,8 +153,12 @@ angle_t getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_SUFFIX) {
angle = getCrankingAdvance(rpm, engineLoad PASS_ENGINE_PARAMETER_SUFFIX); angle = getCrankingAdvance(rpm, engineLoad PASS_ENGINE_PARAMETER_SUFFIX);
assertAngleRange(angle, "crAngle", CUSTOM_ERR_6680); assertAngleRange(angle, "crAngle", CUSTOM_ERR_6680);
efiAssert(CUSTOM_ERR_ASSERT, !cisnan(angle), "cr_AngleN", 0); efiAssert(CUSTOM_ERR_ASSERT, !cisnan(angle), "cr_AngleN", 0);
if (CONFIG(useAdvanceCorrectionsForCranking)) if (CONFIG(useAdvanceCorrectionsForCranking)) {
angle += getAdvanceCorrections(rpm PASS_ENGINE_PARAMETER_SUFFIX); angle_t correction = getAdvanceCorrections(rpm PASS_ENGINE_PARAMETER_SUFFIX);
if (!cisnan(correction)) { // correction could be NaN during settings update
angle += correction;
}
}
efiAssert(CUSTOM_ERR_ASSERT, !cisnan(angle), "cr_AngleN2", 0); efiAssert(CUSTOM_ERR_ASSERT, !cisnan(angle), "cr_AngleN2", 0);
} else { } else {
angle = getRunningAdvance(rpm, engineLoad PASS_ENGINE_PARAMETER_SUFFIX); angle = getRunningAdvance(rpm, engineLoad PASS_ENGINE_PARAMETER_SUFFIX);
@ -162,7 +166,10 @@ angle_t getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_SUFFIX) {
warning(CUSTOM_ERR_6610, "NaN angle from table"); warning(CUSTOM_ERR_6610, "NaN angle from table");
return 0; return 0;
} }
angle += getAdvanceCorrections(rpm PASS_ENGINE_PARAMETER_SUFFIX); angle_t correction = getAdvanceCorrections(rpm PASS_ENGINE_PARAMETER_SUFFIX);
if (!cisnan(correction)) { // correction could be NaN during settings update
angle += correction;
}
efiAssert(CUSTOM_ERR_ASSERT, !cisnan(angle), "AngleN3", 0); efiAssert(CUSTOM_ERR_ASSERT, !cisnan(angle), "AngleN3", 0);
} }
efiAssert(CUSTOM_ERR_ASSERT, !cisnan(angle), "_AngleN4", 0); efiAssert(CUSTOM_ERR_ASSERT, !cisnan(angle), "_AngleN4", 0);