zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

FW POS: remove setting of curr_sp to LOITER if next wp invalid 

Signed-off-by: Silvan Fuhrer <silvan@auterion.com>
release/1.12
Silvan Fuhrer 4 years ago committed by Lorenz Meier
parent
55a1d090a1
commit
0b86c11c66
1 changed files with 0 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/modules/fw_pos_control_l1/FixedwingPositionControl.cpp

3
src/modules/fw_pos_control_l1/FixedwingPositionControl.cpp
Unescape View File

@ -734,9 +734,6 @@ FixedwingPositionControl::control_position(const hrt_abstime &now, const Vector2
&& (dist_xy < 2.f * math::max(acc_rad, fabsf(pos_sp_curr.loiter_radius)))) { && (dist_xy < 2.f * math::max(acc_rad, fabsf(pos_sp_curr.loiter_radius)))) {
// SETPOINT_TYPE_POSITION -> SETPOINT_TYPE_LOITER // SETPOINT_TYPE_POSITION -> SETPOINT_TYPE_LOITER
position_sp_type = position_setpoint_s::SETPOINT_TYPE_LOITER; position_sp_type = position_setpoint_s::SETPOINT_TYPE_LOITER;
} else if ((dist_xy < 2.f * math::max(acc_rad, fabsf(pos_sp_curr.loiter_radius))) && !pos_sp_next.valid) {
position_sp_type = position_setpoint_s::SETPOINT_TYPE_LOITER;
} }
} else if (pos_sp_curr.type == position_setpoint_s::SETPOINT_TYPE_LOITER) { } else if (pos_sp_curr.type == position_setpoint_s::SETPOINT_TYPE_LOITER) {

Write Preview
Loading…
Cancel
Save