Skip to content
Snippets Groups Projects
Commit 5b8ae9fb authored by Martina's avatar Martina Committed by Lorenz Meier
Browse files

rename position_controller_status field from altitude_acceptance_radius

to altitude_acceptance
parent 40650ee2
No related branches found
No related tags found
No related merge requests found
......@@ -13,4 +13,4 @@ float32 acceptance_radius # the optimal distance to a waypoint to switch to the
float32 yaw_acceptance # NaN if not set
float32 altitude_acceptance_radius # the optimal vertical distance to a waypoint to switch to the next
float32 altitude_acceptance # the optimal vertical distance to a waypoint to switch to the next
......@@ -336,7 +336,7 @@ void FlightTaskAuto::_checkAvoidanceProgress()
if (pos_to_target.length() < NAV_ACC_RAD.get() && pos_to_target_z > NAV_MC_ALT_RAD.get()) {
// vehicle above or below the target waypoint
pos_control_status.altitude_acceptance_radius = pos_to_target_z + 0.5f;
pos_control_status.altitude_acceptance = pos_to_target_z + 0.5f;
}
// do not check for waypoints yaw acceptance in navigator
......
......@@ -852,8 +852,8 @@ Navigator::get_default_altitude_acceptance_radius()
const position_controller_status_s &pos_ctrl_status = _position_controller_status_sub.get();
if ((pos_ctrl_status.timestamp > _pos_sp_triplet.timestamp)
&& pos_ctrl_status.altitude_acceptance_radius > alt_acceptance_radius) {
alt_acceptance_radius = pos_ctrl_status.altitude_acceptance_radius;
&& pos_ctrl_status.altitude_acceptance > alt_acceptance_radius) {
alt_acceptance_radius = pos_ctrl_status.altitude_acceptance;
}
return alt_acceptance_radius;
......
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