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

AP_Terrain: prevent valgrind error when terrain not available

This commit is contained in:
Andrew Tridgell 2014-07-25 13:44:36 +10:00
parent bb31a45596
commit 37b357f282
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_Terrain/TerrainGCS.cpp
View File

@ -204,10 +204,14 @@ void AP_Terrain::send_terrain_report(mavlink_channel_t chan, const Location &loc
get_statistics(pending, loaded);
float current_height;
if (current_loc.flags.relative_alt) {
current_height = current_loc.alt*0.01f;
if (spacing == 0) {
current_height = 0;
} else {
current_height = (current_loc.alt - ahrs.get_home().alt)*0.01f;
if (current_loc.flags.relative_alt) {
current_height = current_loc.alt*0.01f;
} else {
current_height = (current_loc.alt - ahrs.get_home().alt)*0.01f;
}
}
current_height += home_terrain_height - terrain_height;