fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-25 08:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_v1.0.0' of github.com:PX4/Firmware

Browse Source
This commit is contained in:
Lorenz Meier
2015-07-02 01:00:06 +02:00
parent 347e3e9a7e 10961aac0e
commit 234990fbe4
9 changed files with 91 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mc_pos_control/mc_pos_control_main.cpp
+5 -1
View File
@@ -1417,7 +1417,11 @@ MulticopterPositionControl::task_main()
/* control throttle directly if no climb rate controller is active */
if (!_control_mode.flag_control_climb_rate_enabled) {
_att_sp.thrust = math::min(_manual.z, _params.thr_max);
_att_sp.thrust = math::max(_att_sp.thrust, _params.thr_min);
/* enforce minimum throttle if not landed */
if (!_vehicle_status.condition_landed) {
_att_sp.thrust = math::max(_att_sp.thrust, _params.thr_min);
}
}
/* construct attitude setpoint rotation matrix */