fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-01 09:01:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

mc_pos_control and FlightTaskAuto rebase fix

Browse Source
This commit is contained in:
Dennis Mannhart
2018-07-20 09:26:18 +02:00
committed by Lorenz Meier
parent 4761f0a344
commit 4a9e5941b6
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/tasks/FlightTaskAuto.cpp
-1
View File
@@ -178,7 +178,6 @@ void FlightTaskAuto::_evaluateVehicleGlobalPosition()
// check if reference has changed and update. // check if reference has changed and update.
if (_sub_vehicle_local_position->get().ref_timestamp != _time_stamp_reference) { if (_sub_vehicle_local_position->get().ref_timestamp != _time_stamp_reference) {
PX4_INFO("inside");
map_projection_init(&_reference_position, map_projection_init(&_reference_position,
_sub_vehicle_local_position->get().ref_lat, _sub_vehicle_local_position->get().ref_lat,
_sub_vehicle_local_position->get().ref_lon); _sub_vehicle_local_position->get().ref_lon);
src/lib/FlightTasks/tasks/FlightTaskAuto.hpp
+1 -1
View File
@@ -42,7 +42,7 @@
#include "FlightTask.hpp" #include "FlightTask.hpp"
#include <uORB/topics/position_setpoint_triplet.h> #include <uORB/topics/position_setpoint_triplet.h>
#include <uORB/topics/position_setpoint.h> #include <uORB/topics/position_setpoint.h>
#include <lib/geo/geo.h> #include <lib/ecl/geo/geo.h>
/** /**
* This enum has to agree with position_setpoint_s type definition * This enum has to agree with position_setpoint_s type definition