dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

matrix: pull explicit constructors

This commit is contained in:
Matthias Grob 2019-10-03 09:29:49 +02:00 committed by Daniel Agar
parent 474c406147
commit c8f3f07ff7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/FlightTasks/tasks/Utility/ObstacleAvoidance.cpp
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

2
src/lib/matrix

@ -1 +1 @@
Subproject commit 973999a4d3c6d4d85bf0153230974fd9571f7846
Subproject commit 92d1c8761ec8e5dbe9ba3f756cebd5e90956a1b2

4
src/modules/navigator/follow_target.cpp
View File

@ -56,7 +56,7 @@
#include "navigator.h"
using matrix::wrap_pi;
using namespace matrix;
constexpr float FollowTarget::_follow_position_matricies[4][9];
@ -89,7 +89,7 @@ void FollowTarget::on_activation()
_follow_target_position = FOLLOW_FROM_BEHIND;
}
_rot_matrix = (_follow_position_matricies[_follow_target_position]);
_rot_matrix = Dcmf(_follow_position_matricies[_follow_target_position]);
}
void FollowTarget::on_active()