Browse Source

small cleanup for FlightTask::_evaluateDistanceToGround if-else

v1.13.0-BW
bazooka joe 3 years ago committed by Daniel Agar
parent
commit
5d95cc001f
  1. 6
      src/modules/flight_mode_manager/tasks/FlightTask/FlightTask.cpp

6
src/modules/flight_mode_manager/tasks/FlightTask/FlightTask.cpp

@ -188,13 +188,15 @@ void FlightTask::_evaluateVehicleLocalPositionSetpoint() @@ -188,13 +188,15 @@ void FlightTask::_evaluateVehicleLocalPositionSetpoint()
void FlightTask::_evaluateDistanceToGround()
{
// Altitude above ground is local z-position or altitude above home or distance sensor altitude depending on what's available
_dist_to_ground = -_position(2);
if (PX4_ISFINITE(_dist_to_bottom)) {
_dist_to_ground = _dist_to_bottom;
} else if (_sub_home_position.get().valid_alt) {
_dist_to_ground = -(_position(2) - _sub_home_position.get().z);
} else {
_dist_to_ground = -_position(2);
}
}

Loading…
Cancel
Save