Skip to content
Snippets Groups Projects
Commit 1144b66a authored by Martina's avatar Martina Committed by Daniel Agar
Browse files

mc_pos_control: temporary solution to enable and disable the execution of

obstacle avoidance waypoints
parent c5d62b55
No related branches found
No related tags found
No related merge requests found
......@@ -81,6 +81,10 @@
#define SIGMA_SINGLE_OP 0.000001f
#define SIGMA_NORM 0.001f
/* temporary solution to enable and disable obstacle avoidance */
#define ENABLE_OBSTACLE_AVOIDANCE false
/**
* Multicopter position control app start / stop handling function
*
......@@ -3488,8 +3492,8 @@ MulticopterPositionControl::use_obstacle_avoidance()
{
/* check that external obstacle avoidance is sending data and that the first point is valid */
return (hrt_elapsed_time((hrt_abstime *)&_traj_wp_avoidance.timestamp) <
TRAJECTORY_STREAM_TIMEOUT_US && (_traj_wp_avoidance.point_valid[trajectory_waypoint_s::POINT_0] == true));
return (ENABLE_OBSTACLE_AVOIDANCE && (hrt_elapsed_time((hrt_abstime *)&_traj_wp_avoidance.timestamp) <
TRAJECTORY_STREAM_TIMEOUT_US) && (_traj_wp_avoidance.point_valid[trajectory_waypoint_s::POINT_0] == true));
}
bool
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment