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

Copter: move checking of fence up

Browse Source
This commit is contained in:
Peter Barker 2019-03-06 10:10:15 +11:00 committed by Randy Mackay
parent a38092e220
commit cc8912255e
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ArduCopter/AP_Arming.cpp
View File

@ -100,23 +100,6 @@ bool AP_Arming_Copter::compass_checks(bool display_failure)
return ret; return ret;
} }
bool AP_Arming_Copter::fence_checks(bool display_failure)
{
#if AC_FENCE == ENABLED
// check fence is initialised
const char *fail_msg = nullptr;
if (!copter.fence.pre_arm_check(fail_msg)) {
if (fail_msg == nullptr) {
check_failed(ARMING_CHECK_NONE, display_failure, "Check fence");
} else {
check_failed(ARMING_CHECK_NONE, display_failure, "%s", fail_msg);
}
return false;
}
#endif
return true;
}
bool AP_Arming_Copter::ins_checks(bool display_failure) bool AP_Arming_Copter::ins_checks(bool display_failure)
{ {
bool ret = AP_Arming::ins_checks(display_failure); bool ret = AP_Arming::ins_checks(display_failure);

1
ArduCopter/AP_Arming.h
View File

@ -40,7 +40,6 @@ protected:
bool board_voltage_checks(bool display_failure) override; bool board_voltage_checks(bool display_failure) override;
// NOTE! the following check functions *DO NOT* call into AP_Arming! // NOTE! the following check functions *DO NOT* call into AP_Arming!
bool fence_checks(bool display_failure);
bool parameter_checks(bool display_failure); bool parameter_checks(bool display_failure);
bool motor_checks(bool display_failure); bool motor_checks(bool display_failure);
bool pilot_throttle_checks(bool display_failure); bool pilot_throttle_checks(bool display_failure);