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

remove empty lines

Browse Source
This commit is contained in:
Martina
2018-07-18 08:53:20 +02:00
committed by Daniel Agar
parent da2191b721
commit aef41a1378
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/FlightTasks.cpp
-2
View File
@@ -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;
}
src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp
-1
View File
@@ -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)
src/modules/mc_pos_control/mc_pos_control_main.cpp
-4
View File
@@ -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();
}