Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-09 09:28:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Plane: fixed build without terrain

Browse Source
This commit is contained in:
Andrew Tridgell 2020-06-23 08:37:11 +10:00
parent 847452f01b
commit eabe320cee
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduPlane/AP_Arming.cpp
View File

@ -88,6 +88,7 @@ bool AP_Arming_Plane::pre_arm_checks(bool display_failure)
} }
} }
#if AP_TERRAIN_AVAILABLE
if (plane.g.terrain_follow || plane.mission.contains_terrain_relative()) { if (plane.g.terrain_follow || plane.mission.contains_terrain_relative()) {
// check terrain data is loaded and healthy // check terrain data is loaded and healthy
uint16_t terr_pending=0, terr_loaded=0; uint16_t terr_pending=0, terr_loaded=0;
@ -100,6 +101,7 @@ bool AP_Arming_Plane::pre_arm_checks(bool display_failure)
ret = false; ret = false;
} }
} }
#endif
if (plane.control_mode == &plane.mode_auto && plane.mission.num_commands() <= 1) { if (plane.control_mode == &plane.mode_auto && plane.mission.num_commands() <= 1) {
check_failed(display_failure, "No mission loaded"); check_failed(display_failure, "No mission loaded");