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

L1_pos_controller: Fixed strange bitwise or

Browse Source
This commit is contained in:
Julian Oes
2013-11-21 10:47:02 +01:00
parent 18941155b2
commit dca72ba6ee
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ecl/l1/ecl_l1_pos_controller.cpp
+1 -1
View File
@@ -280,7 +280,7 @@ void ECL_L1_Pos_Controller::navigate_loiter(const math::Vector2f &vector_A, cons
*/ */
// XXX check switch over // XXX check switch over
if ((lateral_accel_sp_center < lateral_accel_sp_circle && loiter_direction > 0 && xtrack_err_circle > 0.0f) | if ((lateral_accel_sp_center < lateral_accel_sp_circle && loiter_direction > 0 && xtrack_err_circle > 0.0f) ||
(lateral_accel_sp_center > lateral_accel_sp_circle && loiter_direction < 0 && xtrack_err_circle > 0.0f)) { (lateral_accel_sp_center > lateral_accel_sp_circle && loiter_direction < 0 && xtrack_err_circle > 0.0f)) {
_lateral_accel = lateral_accel_sp_center; _lateral_accel = lateral_accel_sp_center;
_circle_mode = false; _circle_mode = false;