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

reset the position lock only if current triplet latitude and longitude

Browse Source 
are valid
This commit is contained in:
Martina Rivizzigno
2019-06-12 14:21:16 -04:00
committed by Daniel Agar
parent 0c110a4443
commit 413acc57be
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp
+3 -1
View File
@@ -178,10 +178,12 @@ bool FlightTaskAuto::_evaluateTriplets()
} else { } else {
tmp_target(0) = _lock_position_xy(0); tmp_target(0) = _lock_position_xy(0);
tmp_target(1) = _lock_position_xy(1); tmp_target(1) = _lock_position_xy(1);
_lock_position_xy.setAll(NAN);
} }
} else { } else {
// reset locked position if current lon and lat are valid
_lock_position_xy.setAll(NAN);
// Convert from global to local frame. // Convert from global to local frame.
map_projection_project(&_reference_position, map_projection_project(&_reference_position,
_sub_triplet_setpoint->get().current.lat, _sub_triplet_setpoint->get().current.lon, &tmp_target(0), &tmp_target(1)); _sub_triplet_setpoint->get().current.lat, _sub_triplet_setpoint->get().current.lon, &tmp_target(0), &tmp_target(1));