diff --git a/src/lib/FlightTasks/FlightTasks.cpp b/src/lib/FlightTasks/FlightTasks.cpp index 9e4279c50f..f14fe3ee89 100644 --- a/src/lib/FlightTasks/FlightTasks.cpp +++ b/src/lib/FlightTasks/FlightTasks.cpp @@ -49,7 +49,6 @@ const vehicle_constraints_s FlightTasks::getConstraints() const vehicle_trajectory_waypoint_s FlightTasks::getAvoidanceWaypoint() { - if (isAnyTaskActive()) { return _current_task.task->getAvoidanceWaypoint(); @@ -60,7 +59,6 @@ const vehicle_trajectory_waypoint_s FlightTasks::getAvoidanceWaypoint() const vehicle_trajectory_waypoint_s FlightTasks::getEmptyAvoidanceWaypoint() { - return FlightTask::empty_trajectory_waypoint; } diff --git a/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp b/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp index 3361b23f94..100cb49689 100644 --- a/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp +++ b/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp @@ -289,7 +289,6 @@ void FlightTaskAuto::_updateAvoidanceWaypoints() _sub_triplet_setpoint->get().next.yawspeed_valid ? _sub_triplet_setpoint->get().next.yawspeed : NAN; _desired_waypoint.waypoints[vehicle_trajectory_waypoint_s::POINT_2].point_valid = true; - } bool FlightTaskAuto::_isFinite(const position_setpoint_s sp) 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 e62d52c595..c9ee900d5e 100644 --- a/src/modules/mc_pos_control/mc_pos_control_main.cpp +++ b/src/modules/mc_pos_control/mc_pos_control_main.cpp @@ -960,13 +960,11 @@ MulticopterPositionControl::update_avoidance_waypoint_desired(PositionControlSta _traj_wp_avoidance_desired.waypoints[vehicle_trajectory_waypoint_s::POINT_0].yaw = states.yaw; _traj_wp_avoidance_desired.waypoints[vehicle_trajectory_waypoint_s::POINT_0].yaw_speed = NAN; _traj_wp_avoidance_desired.waypoints[vehicle_trajectory_waypoint_s::POINT_0].point_valid = true; - } void MulticopterPositionControl::execute_avoidance_waypoint() { - vehicle_local_position_setpoint_s setpoint; setpoint.x = _traj_wp_avoidance.waypoints[vehicle_trajectory_waypoint_s::POINT_0].position[0]; @@ -983,7 +981,6 @@ MulticopterPositionControl::execute_avoidance_waypoint() Vector3f(NAN, NAN, NAN).copyTo(setpoint.thrust); _control.updateSetpoint(setpoint); - } bool @@ -1011,7 +1008,6 @@ MulticopterPositionControl::publish_avoidance_desired_waypoint() //reset avoidance waypoint desired _traj_wp_avoidance_desired = _flight_tasks.getEmptyAvoidanceWaypoint(); - }