Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-26 01:33:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Common: fix compile when using AP_TERRAIN_AVAILABLE 0

Browse Source
This commit is contained in:
Tom Pittenger 2016-05-20 12:28:46 -07:00
parent 3555e439a4
commit f085666032
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Common/Location.cpp
View File

@ -128,13 +128,17 @@ bool Location_Class::get_alt_cm(ALT_FRAME desired_frame, int32_t &ret_alt_cm) co
} }
// check for terrain altitude // check for terrain altitude
float alt_terr_cm; float alt_terr_cm = 0;
if (frame == ALT_FRAME_ABOVE_TERRAIN || desired_frame == ALT_FRAME_ABOVE_TERRAIN) { if (frame == ALT_FRAME_ABOVE_TERRAIN || desired_frame == ALT_FRAME_ABOVE_TERRAIN) {
#if AP_TERRAIN_AVAILABLE
if (_ahrs == NULL || _terrain == NULL || !_terrain->height_amsl(*(Location *)this, alt_terr_cm, true)) { if (_ahrs == NULL || _terrain == NULL || !_terrain->height_amsl(*(Location *)this, alt_terr_cm, true)) {
return false; return false;
} }
// convert terrain alt to cm // convert terrain alt to cm
alt_terr_cm *= 100.0f; alt_terr_cm *= 100.0f;
#else
return false;
#endif
} }
// convert alt to absolute // convert alt to absolute