Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Mission: replace location_offset() and get_distance() function calls with Location object member function calls 

This allows removing duplicated code
This commit is contained in:
Dr.-Ing. Amilcar do Carmo Lucas 2019-02-25 01:16:23 +01:00 committed by Peter Barker
parent 003a346ee2
commit fa9a460c30
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_Mission/AP_Mission.cpp
View File

@ -1777,7 +1777,7 @@ uint16_t AP_Mission::get_landing_sequence_start()
continue;
}
if (tmp.id == MAV_CMD_DO_LAND_START) {
float tmp_distance = get_distance(tmp.content.location, current_loc);
float tmp_distance = tmp.content.location.get_distance(current_loc);
if (min_distance < 0 || tmp_distance < min_distance) {
min_distance = tmp_distance;
landing_start_index = i;
@ -1826,7 +1826,7 @@ bool AP_Mission::jump_to_abort_landing_sequence(void)
continue;
}
if (tmp.id == MAV_CMD_DO_GO_AROUND) {
float tmp_distance = get_distance(tmp.content.location, current_loc);
float tmp_distance = tmp.content.location.get_distance(current_loc);
if (tmp_distance < min_distance) {
min_distance = tmp_distance;
abort_index = i;