Browse Source

L1_pos_controller: Fixed strange bitwise or

sbg
Julian Oes 11 years ago
parent
commit
dca72ba6ee
  1. 2
      src/lib/ecl/l1/ecl_l1_pos_controller.cpp

2
src/lib/ecl/l1/ecl_l1_pos_controller.cpp

@ -280,7 +280,7 @@ void ECL_L1_Pos_Controller::navigate_loiter(const math::Vector2f &vector_A, cons @@ -280,7 +280,7 @@ void ECL_L1_Pos_Controller::navigate_loiter(const math::Vector2f &vector_A, cons
*/
// 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 = lateral_accel_sp_center;
_circle_mode = false;

Loading…
Cancel
Save