diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-02 18:36:00 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-02 18:36:00 +0200 |
| commit | 7df87187c0c25dc481067cf1fc8c0bc5e462e181 (patch) | |
| tree | 5f6d527b7eac717a120187d2d5afa2c0f64b2094 | |
| parent | 41a763a50e99880147a2e4f5a6988299f8fd6dac (diff) | |
| parent | eb02c6ce4900a3dfe96592219852b2205c5d691d (diff) | |
| download | px4-firmware-7df87187c0c25dc481067cf1fc8c0bc5e462e181.tar.gz px4-firmware-7df87187c0c25dc481067cf1fc8c0bc5e462e181.tar.bz2 px4-firmware-7df87187c0c25dc481067cf1fc8c0bc5e462e181.zip | |
Merge remote-tracking branch 'upstream/mtecs' into mtecs_wind_estimate
| -rw-r--r-- | src/modules/fw_pos_control_l1/mtecs/mTecs.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/fw_pos_control_l1/mtecs/mTecs.cpp b/src/modules/fw_pos_control_l1/mtecs/mTecs.cpp index 3de51695e..32f9f19ca 100644 --- a/src/modules/fw_pos_control_l1/mtecs/mTecs.cpp +++ b/src/modules/fw_pos_control_l1/mtecs/mTecs.cpp @@ -185,8 +185,8 @@ int mTecs::updateFlightPathAngleAcceleration(float flightPathAngle, float flight (double)energyDistributionRateSp, (double)energyDistributionRate, (double)energyDistributionRateError, (double)energyDistributionRateError2); } - /* Check airspeed: if below safe value switch to underspeed mode (if not in takeoff mode) */ - if (mode != TECS_MODE_LAND && airspeed < _airspeedMin.get()) { + /* Check airspeed: if below safe value switch to underspeed mode (if not in land or takeoff mode) */ + if (mode != TECS_MODE_LAND && mode != TECS_MODE_TAKEOFF && airspeed < _airspeedMin.get()) { mode = TECS_MODE_UNDERSPEED; } |