Merge pull request #2187 from PX4/fixconstrainairspeed

make constrain airspeed actually constrain the airspeed
This commit is contained in:
Lorenz Meier
2015-05-16 23:20:06 +02:00

View File

@@ -132,9 +132,9 @@ float ECL_Controller::constrain_airspeed(float airspeed, float minspeed, float m
float airspeed_result = airspeed; float airspeed_result = airspeed;
if (!isfinite(airspeed)) { if (!isfinite(airspeed)) {
/* airspeed is NaN, +- INF or not available, pick center of band */ /* airspeed is NaN, +- INF or not available, pick center of band */
airspeed = 0.5f * (minspeed + maxspeed); airspeed_result = 0.5f * (minspeed + maxspeed);
} else if (airspeed < minspeed) { } else if (airspeed < minspeed) {
airspeed = minspeed; airspeed_result = minspeed;
} }
return airspeed_result; return airspeed_result;
} }