aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Terrain: rename find_grid() to find_grid_cache()

Browse Source 
thanks Randy!
This commit is contained in:
Andrew Tridgell 2014-07-25 09:52:20 +10:00
parent 1fcf35333f
commit c4047f6f11
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Terrain/AP_Terrain.cpp
View File

@ -94,7 +94,7 @@ bool AP_Terrain::height_amsl(const Location &loc, float &height)
calculate_grid_info(loc, info); calculate_grid_info(loc, info);
// find the grid // find the grid
const struct grid_block &grid = find_grid(info).grid; const struct grid_block &grid = find_grid_cache(info).grid;
/* /*
note that we rely on the one square overlap to ensure these note that we rely on the one square overlap to ensure these

2
libraries/AP_Terrain/AP_Terrain.h
View File

@ -253,7 +253,7 @@ private:
/* /*
find a grid structure given a grid_info find a grid structure given a grid_info
*/ */
struct grid_cache &find_grid(const struct grid_info &info); struct grid_cache &find_grid_cache(const struct grid_info &info);
/* /*
calculate bit number in grid_block bitmap. This corresponds to a calculate bit number in grid_block bitmap. This corresponds to a

2
libraries/AP_Terrain/TerrainGCS.cpp
View File

@ -65,7 +65,7 @@ bool AP_Terrain::request_missing(mavlink_channel_t chan, struct grid_cache &gcac
bool AP_Terrain::request_missing(mavlink_channel_t chan, const struct grid_info &info) bool AP_Terrain::request_missing(mavlink_channel_t chan, const struct grid_info &info)
{ {
// find the grid // find the grid
struct grid_cache &gcache = find_grid(info); struct grid_cache &gcache = find_grid_cache(info);
return request_missing(chan, gcache); return request_missing(chan, gcache);
} }

2
libraries/AP_Terrain/TerrainUtil.cpp
View File

@ -115,7 +115,7 @@ void AP_Terrain::calculate_grid_info(const Location &loc, struct grid_info &info
/* /*
find a grid structure given a grid_info find a grid structure given a grid_info
*/ */
AP_Terrain::grid_cache &AP_Terrain::find_grid(const struct grid_info &info) AP_Terrain::grid_cache &AP_Terrain::find_grid_cache(const struct grid_info &info)
{ {
uint16_t oldest_i = 0; uint16_t oldest_i = 0;