fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-21 14:37:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into inav_fix

Browse Source
This commit is contained in:
Anton Babushkin
2013-09-30 19:39:55 +02:00
parent 45a95ab5e7 1b32ba2436
commit 921662ebe0
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
+2 -1
View File
@@ -734,9 +734,10 @@ FixedwingPositionControl::control_position(const math::Vector2f &current_positio
/* apply minimum pitch and limit roll if target altitude is not within 10 meters */
if (altitude_error > 10.0f) {
/* enforce a minimum of 10 degrees pitch up on takeoff, or take parameter */
_tecs.update_pitch_throttle(_R_nb, _att.pitch, _global_pos.alt, _global_triplet.current.altitude, calculate_target_airspeed(_parameters.airspeed_min),
_airspeed.indicated_airspeed_m_s, eas2tas,
true, math::radians(global_triplet.current.param1),
true, math::max(math::radians(global_triplet.current.param1), math::radians(10.0f)),
_parameters.throttle_min, _parameters.throttle_max, _parameters.throttle_cruise,
math::radians(_parameters.pitch_limit_min), math::radians(_parameters.pitch_limit_max));