mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-05-23 09:47:35 +08:00
mc_pos_control and FlightTaskAuto rebase fix
This commit is contained in:
committed by
Lorenz Meier
parent
4761f0a344
commit
4a9e5941b6
@@ -178,7 +178,6 @@ void FlightTaskAuto::_evaluateVehicleGlobalPosition()
|
||||
|
||||
// check if reference has changed and update.
|
||||
if (_sub_vehicle_local_position->get().ref_timestamp != _time_stamp_reference) {
|
||||
PX4_INFO("inside");
|
||||
map_projection_init(&_reference_position,
|
||||
_sub_vehicle_local_position->get().ref_lat,
|
||||
_sub_vehicle_local_position->get().ref_lon);
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "FlightTask.hpp"
|
||||
#include <uORB/topics/position_setpoint_triplet.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
|
||||
|
||||
Reference in New Issue
Block a user