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

mc_pos_control: use consistent naming for position waypoints

Browse Source
This commit is contained in:
Martina
2018-04-06 08:48:49 +02:00
committed by Daniel Agar
parent 3fa094cb6b
commit 272d7ca4cd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mc_pos_control/mc_pos_control_main.cpp
+4 -4
View File
@@ -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;