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_Arming: move terrain prearm checks to AP_Terrain

Browse Source
This commit is contained in:
Peter Barker 2022-08-04 10:38:42 +10:00 committed by Peter Barker
parent fecf7c2e0c
commit 96ef34acac
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Arming/AP_Arming.cpp
View File

@ -1057,11 +1057,9 @@ bool AP_Arming::terrain_checks(bool report) const
return false;
}
// check terrain data is loaded
uint16_t terr_pending, terr_loaded;
terrain->get_statistics(terr_pending, terr_loaded);
if (terr_pending != 0) {
check_failed(ARMING_CHECK_PARAMETERS, report, "waiting for terrain data");
char fail_msg[MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN+1];
if (!terrain->pre_arm_checks(fail_msg, sizeof(fail_msg))) {
check_failed(ARMING_CHECK_PARAMETERS, report, "%s", fail_msg);
return false;
}