Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 08:38:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Rally: adjust for location flags being moved out of union

Browse Source
This commit is contained in:
Peter Barker 2019-01-02 11:08:36 +11:00 committed by Peter Barker
parent dd8da7321c
commit 1f5727c0b2
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_Rally/AP_Rally.cpp
View File

@ -101,7 +101,7 @@ Location AP_Rally::rally_location_to_location(const RallyLocation &rally_loc) co
Location ret = {};
// we return an absolute altitude, as we add homeloc.alt below
ret.flags.relative_alt = false;
ret.relative_alt = false;
//Currently can't do true AGL on the APM. Relative altitudes are
//relative to HOME point's altitude. Terrain on the board is inbound
@ -152,7 +152,7 @@ Location AP_Rally::calc_best_rally_or_home_location(const Location &current_loc,
// no valid rally point, return home position
return_loc = home_loc;
return_loc.alt = rtl_home_alt;
return_loc.flags.relative_alt = false; // read_alt_to_hold returns an absolute altitude
return_loc.relative_alt = false; // read_alt_to_hold returns an absolute altitude
if (find_nearest_rally_point(current_loc, ral_loc)) {
Location loc = rally_location_to_location(ral_loc);