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

better state validation

This commit is contained in:
rusEfi 2019-06-27 22:23:18 -04:00
parent e99f5ab0a6
commit db2ff1c180
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/controllers/map_averaging.cpp
View File

@ -280,6 +280,7 @@ static void mapAveragingTriggerCallback(trigger_event_e ckpEventType,
angle_t samplingStart = ENGINE(engineState.mapAveragingStart[i]);
angle_t samplingDuration = ENGINE(engineState.mapAveragingDuration);
assertAngleRange(samplingDuration, "samplingDuration", CUSTOM_ERR_6563);
if (samplingDuration <= 0) {
warning(CUSTOM_MAP_ANGLE_PARAM, "map sampling angle should be positive");
return;

12
firmware/util/math/interpolation.cpp
View File

@ -101,6 +101,14 @@ float FastInterpolation::getValue(float x) const {
* @note For example, "interpolateMsg("", engineConfiguration.tpsMin, 0, engineConfiguration.tpsMax, 100, adc);"
*/
float interpolateMsg(const char *msg, float x1, float y1, float x2, float y2, float x) {
if (cisnan(x1) || cisnan(x2) || cisnan(y1) || cisnan(y2)) {
warning(CUSTOM_INTEPOLATE_ERROR, "interpolate%s: why param", msg);
return NAN;
}
if (cisnan(x)) {
warning(CUSTOM_INTEPOLATE_ERROR, "interpolate%s: why X", msg);
return NAN;
}
// todo: double comparison using EPS
if (x1 == x2) {
/**
@ -114,6 +122,10 @@ float interpolateMsg(const char *msg, float x1, float y1, float x2, float y2, fl
// a*x2 + b = y2
// efiAssertVoid(CUSTOM_ERR_ASSERT_VOID, x1 != x2, "no way we can interpolate");
float a = INTERPOLATION_A(x1, y1, x2, y2);
if (cisnan(a)) {
warning(CUSTOM_INTEPOLATE_ERROR, "interpolate%s: why a", msg);
return NAN;
}
float b = y1 - a * x1;
float result = a * x + b;
#if DEBUG_FUEL