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

AP_Arming: change AC_FENCE to AP_FENCE_ENABLED

This commit is contained in:
Iampete1 2022-07-19 12:33:12 +01:00 committed by Andrew Tridgell
parent 4b6a0f0b4f
commit 58d244d7a3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Arming/AP_Arming.cpp
View File

@ -1099,7 +1099,7 @@ bool AP_Arming::can_checks(bool report)
bool AP_Arming::fence_checks(bool display_failure)
{
#if AC_FENCE
#if AP_FENCE_ENABLED
const AC_Fence *fence = AP::fence();
if (fence == nullptr) {
return true;
@ -1388,7 +1388,7 @@ bool AP_Arming::arm_checks(AP_Arming::Method method)
}
}
#if AC_FENCE
#if AP_FENCE_ENABLED
AC_Fence *fence = AP::fence();
if (fence != nullptr) {
// If a fence is set to auto-enable, turn on the fence
@ -1495,7 +1495,7 @@ bool AP_Arming::disarm(const AP_Arming::Method method, bool do_disarm_checks)
}
#endif
#if AC_FENCE
#if AP_FENCE_ENABLED
AC_Fence *fence = AP::fence();
if (fence != nullptr) {
if(fence->auto_enabled() == AC_Fence::AutoEnable::ONLY_WHEN_ARMED) {