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

adjust to astyle format

This commit is contained in:
Dennis Mannhart 2016-12-07 08:48:44 +01:00 committed by Lorenz Meier
parent 5ed35e9731
commit c2b6381759
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -927,6 +927,7 @@ MulticopterPositionControl::control_manual(float dt)
if (!_pos_hold_engaged) {
float vel_xy_mag = sqrtf(_vel(0) * _vel(0) + _vel(1) * _vel(1));
if (_params.hold_max_xy < FLT_EPSILON || vel_xy_mag < _params.hold_max_xy) {
/* reset position setpoint to have smooth transition from velocity control to position control */
_pos_hold_engaged = true;