Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_TECS: Auto landing now takes throttle_nudge into account.

This commit is contained in:
Michael Day 2014-03-10 10:41:05 -07:00 committed by Andrew Tridgell
parent 861690dea2
commit bd7e1b82e1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_TECS/AP_TECS.cpp
View File

@ -215,8 +215,8 @@ void AP_TECS::_update_speed(void)
_TAS_dem = _EAS_dem * EAS2TAS;
if (_landAirspeed > -1 && _ahrs.airspeed_sensor_enabled() &&
(_flight_stage == FLIGHT_LAND_APPROACH || _flight_stage== FLIGHT_LAND_FINAL)) {
_TASmax = _landAirspeed;
_TASmin = _landAirspeed;
_TASmax = _landAirspeed * EAS2TAS;
_TASmin = _landAirspeed * EAS2TAS;
} else { //not landing, or not using TECS_LAND_ASPD parameter
_TASmax = aparm.airspeed_max * EAS2TAS;
_TASmin = aparm.airspeed_min * EAS2TAS;
@ -456,7 +456,7 @@ void AP_TECS::_update_throttle_option(int16_t throttle_nudge)
//TECS_LAND_THR param then use it
if ((_flight_stage == FLIGHT_LAND_APPROACH || _flight_stage== FLIGHT_LAND_FINAL) &&
_landThrottle > -1) {
nomThr = _landThrottle * 0.01f;
nomThr = (_landThrottle + throttle_nudge) * 0.01f;
} else { //not landing or not using TECS_LAND_THR parameter
nomThr = (aparm.throttle_cruise + throttle_nudge)* 0.01f;
}