Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Mission: rename contains_terrain_relative->contains_terrain_alt_items

Browse Source 
can we rename "constains_terrain_relative" to "contains_terrain_alt"? No big deal of course but "terrain_alt" is what we use in Copter so it's more likely to show up in searches.
This commit is contained in:
Peter Barker 2022-08-09 14:35:58 +10:00 committed by Peter Barker
parent 6709c6d72d
commit 5b3a6daa7b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Mission/AP_Mission.cpp
View File

@ -2468,16 +2468,16 @@ bool AP_Mission::contains_item(MAV_CMD command) const
/*
return true if the mission has a terrain relative item. ~2200us for 530 items on H7
*/
bool AP_Mission::contains_terrain_relative(void)
bool AP_Mission::contains_terrain_alt_items(void)
{
if (_last_contains_relative_calculated_ms != _last_change_time_ms) {
_contains_terrain_relative = calculate_contains_terrain_relative();
_contains_terrain_alt_items = calculate_contains_terrain_alt_items();
_last_contains_relative_calculated_ms = _last_change_time_ms;
}
return _contains_terrain_relative;
return _contains_terrain_alt_items;
}
bool AP_Mission::calculate_contains_terrain_relative(void) const
bool AP_Mission::calculate_contains_terrain_alt_items(void) const
{
for (int i = 1; i < num_commands(); i++) {
Mission_Command tmp;

8
libraries/AP_Mission/AP_Mission.h
View File

@ -620,7 +620,7 @@ public:
bool contains_item(MAV_CMD command) const;
// returns true if the mission has a terrain relative mission item
bool contains_terrain_relative(void);
bool contains_terrain_alt_items(void);
// reset the mission history to prevent recalling previous mission histories when restarting missions.
void reset_wp_history(void);
@ -765,9 +765,9 @@ private:
uint32_t _last_change_time_ms;
// memoisation of contains-relative:
bool _contains_terrain_relative; // true if the mission has terrain-relative items
uint32_t _last_contains_relative_calculated_ms; // will be equal to _last_change_time_ms if _contains_terrain_relative is up-to-date
bool calculate_contains_terrain_relative(void) const;
bool _contains_terrain_alt_items; // true if the mission has terrain-relative items
uint32_t _last_contains_relative_calculated_ms; // will be equal to _last_change_time_ms if _contains_terrain_alt_items is up-to-date
bool calculate_contains_terrain_alt_items(void) const;
// multi-thread support. This is static so it can be used from
// const functions