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

matrix: pull explicit constructors

Browse Source
This commit is contained in:
Matthias Grob
2019-10-05 11:46:07 -04:00
committed by Daniel Agar
parent 474c406147
commit c8f3f07ff7
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/tasks/Utility/ObstacleAvoidance.cpp
+2 -2
View File
@@ -95,8 +95,8 @@ void ObstacleAvoidance::injectAvoidanceSetpoints(Vector3f &pos_sp, Vector3f &vel
}
if (avoidance_point_valid) {
pos_sp = _sub_vehicle_trajectory_waypoint.get().waypoints[vehicle_trajectory_waypoint_s::POINT_0].position;
vel_sp = _sub_vehicle_trajectory_waypoint.get().waypoints[vehicle_trajectory_waypoint_s::POINT_0].velocity;
pos_sp = Vector3f(_sub_vehicle_trajectory_waypoint.get().waypoints[vehicle_trajectory_waypoint_s::POINT_0].position);
vel_sp = Vector3f(_sub_vehicle_trajectory_waypoint.get().waypoints[vehicle_trajectory_waypoint_s::POINT_0].velocity);
if (!_ext_yaw_active) {
// inject yaw setpoints only if weathervane isn't active
src/lib/matrix
+1 -1
Submodule src/lib/matrix updated: 973999a4d3...92d1c8761e