diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-09-30 19:39:55 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-09-30 19:39:55 +0200 |
| commit | 921662ebe09ca737c7becf37a7fe063a680e344a (patch) | |
| tree | 2200be1875cde9c2742f82aefea7463086a847e5 /src/modules | |
| parent | 45a95ab5e7110c4169d89fbdce61b91a36a05a8c (diff) | |
| parent | 1b32ba2436848745e0a78c59fffa0a767cab9d3c (diff) | |
| download | px4-firmware-921662ebe09ca737c7becf37a7fe063a680e344a.tar.gz px4-firmware-921662ebe09ca737c7becf37a7fe063a680e344a.tar.bz2 px4-firmware-921662ebe09ca737c7becf37a7fe063a680e344a.zip | |
Merge branch 'master' into inav_fix
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp index d6d135f9f..3d5bce134 100644 --- a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp +++ b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp @@ -734,9 +734,10 @@ FixedwingPositionControl::control_position(const math::Vector2f ¤t_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)); |