From 272d7ca4cd6a0b371bea84dc9df68f067b61c703 Mon Sep 17 00:00:00 2001 From: Martina Date: Fri, 6 Apr 2018 08:48:49 +0200 Subject: [PATCH] mc_pos_control: use consistent naming for position waypoints --- src/modules/mc_pos_control/mc_pos_control_main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/mc_pos_control/mc_pos_control_main.cpp b/src/modules/mc_pos_control/mc_pos_control_main.cpp index f0c08326f1..b20c327f27 100644 --- a/src/modules/mc_pos_control/mc_pos_control_main.cpp +++ b/src/modules/mc_pos_control/mc_pos_control_main.cpp @@ -420,7 +420,7 @@ private: bool use_obstacle_avoidance(); - bool use_pos_wp_avoidance(); + bool use_avoidance_position_waypoint(); bool use_avoidance_velocity_waypoint(); @@ -2444,7 +2444,7 @@ MulticopterPositionControl::control_position() void MulticopterPositionControl::calculate_velocity_setpoint() { - if (use_pos_wp_avoidance()) { + if (use_avoidance_position_waypoint()) { execute_avoidance_position_waypoint(); } @@ -3506,7 +3506,7 @@ MulticopterPositionControl::use_obstacle_avoidance() } bool -MulticopterPositionControl::use_pos_wp_avoidance() +MulticopterPositionControl::use_avoidance_position_waypoint() { return use_obstacle_avoidance() && PX4_ISFINITE(_traj_wp_avoidance.point_0[trajectory_waypoint_s::X]) && PX4_ISFINITE(_traj_wp_avoidance.point_0[trajectory_waypoint_s::Y]) @@ -3584,7 +3584,7 @@ void MulticopterPositionControl::update_avoidance_waypoints_desired(const int po } void -MulticopterPositionControl::reset_wp_avoidance_desired() +MulticopterPositionControl::reset_avoidance_waypoint_desired() { const int point_size = 11;