From 2fc9cf97d407a2f12470f5f8d0da53f94e8e3dec Mon Sep 17 00:00:00 2001 From: Iampete1 Date: Mon, 25 Jul 2022 17:51:32 +0100 Subject: [PATCH] AC_Fence: defualt to AP_FENCE_ENABLED 2, 1 disables dummy methods --- libraries/AC_Fence/AC_Fence.cpp | 2 +- libraries/AC_Fence/AC_Fence_config.h | 8 +++++++- libraries/AC_Fence/AC_PolyFence_loader.cpp | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libraries/AC_Fence/AC_Fence.cpp b/libraries/AC_Fence/AC_Fence.cpp index ba050f62d5..218ab9fe96 100644 --- a/libraries/AC_Fence/AC_Fence.cpp +++ b/libraries/AC_Fence/AC_Fence.cpp @@ -5,7 +5,7 @@ #include #ifndef AC_FENCE_DUMMY_METHODS_ENABLED -#define AC_FENCE_DUMMY_METHODS_ENABLED (!(APM_BUILD_TYPE(APM_BUILD_Rover) | APM_BUILD_COPTER_OR_HELI | APM_BUILD_TYPE(APM_BUILD_ArduPlane) | APM_BUILD_TYPE(APM_BUILD_ArduSub))) +#define AC_FENCE_DUMMY_METHODS_ENABLED (!(APM_BUILD_TYPE(APM_BUILD_Rover) | APM_BUILD_COPTER_OR_HELI | APM_BUILD_TYPE(APM_BUILD_ArduPlane) | APM_BUILD_TYPE(APM_BUILD_ArduSub) | (AP_FENCE_ENABLED == 1))) #endif #if !AC_FENCE_DUMMY_METHODS_ENABLED diff --git a/libraries/AC_Fence/AC_Fence_config.h b/libraries/AC_Fence/AC_Fence_config.h index da35192f33..5c8494f7ad 100644 --- a/libraries/AC_Fence/AC_Fence_config.h +++ b/libraries/AC_Fence/AC_Fence_config.h @@ -1,5 +1,11 @@ #pragma once +#include + +// Enabled 0 is compiled out +// Enabled 1 is always enabled on all vehicles +// Enabled 2 is enabled with dummy methods for tracker and blimp + #ifndef AP_FENCE_ENABLED -#define AP_FENCE_ENABLED 1 +#define AP_FENCE_ENABLED 2 #endif diff --git a/libraries/AC_Fence/AC_PolyFence_loader.cpp b/libraries/AC_Fence/AC_PolyFence_loader.cpp index ccdb456b94..a7f3993db2 100644 --- a/libraries/AC_Fence/AC_PolyFence_loader.cpp +++ b/libraries/AC_Fence/AC_PolyFence_loader.cpp @@ -5,7 +5,7 @@ #include #ifndef AC_FENCE_DUMMY_METHODS_ENABLED -#define AC_FENCE_DUMMY_METHODS_ENABLED (!(APM_BUILD_TYPE(APM_BUILD_Rover) | APM_BUILD_COPTER_OR_HELI | APM_BUILD_TYPE(APM_BUILD_ArduPlane) | APM_BUILD_TYPE(APM_BUILD_ArduSub))) +#define AC_FENCE_DUMMY_METHODS_ENABLED (!(APM_BUILD_TYPE(APM_BUILD_Rover) | APM_BUILD_COPTER_OR_HELI | APM_BUILD_TYPE(APM_BUILD_ArduPlane) | APM_BUILD_TYPE(APM_BUILD_ArduSub) | (AP_FENCE_ENABLED == 1))) #endif #if !AC_FENCE_DUMMY_METHODS_ENABLED