dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

mc_pos_control: bug fixed

This commit is contained in:
Anton Babushkin 2014-01-08 15:43:58 +01:00
parent 6381590997
commit 255db83e93
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/mc_pos_control/mc_pos_control_main.cpp
View File

@ -597,12 +597,23 @@ MulticopterPositionControl::task_main()
_pos_sp += sp_move_rate * dt; _pos_sp += sp_move_rate * dt;
/* check if position setpoint is too far from actual position */ /* check if position setpoint is too far from actual position */
math::Vector<3> pos_sp_offs = (_pos_sp - _pos).edivide(_params.vel_max); math::Vector<3> pos_sp_offs;
pos_sp_offs.zero();
if (_control_mode.flag_control_position_enabled) {
pos_sp_offs(0) = (_pos_sp(0) - _pos(0)) / _params.sp_offs_max(0);
pos_sp_offs(1) = (_pos_sp(1) - _pos(1)) / _params.sp_offs_max(1);
}
if (!_control_mode.flag_control_altitude_enabled) {
pos_sp_offs(2) = (_pos_sp(2) - _pos(2)) / _params.sp_offs_max(2);
}
float pos_sp_offs_norm = pos_sp_offs.length(); float pos_sp_offs_norm = pos_sp_offs.length();
if (pos_sp_offs_norm > 1.0f) { if (pos_sp_offs_norm > 1.0f) {
pos_sp_offs /= pos_sp_offs_norm; pos_sp_offs /= pos_sp_offs_norm;
_pos_sp = _pos + pos_sp_offs.emult(_params.vel_max); _pos_sp = _pos + pos_sp_offs.emult(_params.sp_offs_max);
} }
} else { } else {