diff --git a/libraries/AP_Proximity/AP_Proximity.h b/libraries/AP_Proximity/AP_Proximity.h index 1c224b6981..d095ba9093 100644 --- a/libraries/AP_Proximity/AP_Proximity.h +++ b/libraries/AP_Proximity/AP_Proximity.h @@ -14,11 +14,7 @@ */ #pragma once -#include - -#ifndef HAL_PROXIMITY_ENABLED -#define HAL_PROXIMITY_ENABLED (!HAL_MINIMIZE_FEATURES && BOARD_FLASH_SIZE > 1024) -#endif +#include "AP_Proximity_config.h" #if HAL_PROXIMITY_ENABLED diff --git a/libraries/AP_Proximity/AP_Proximity_config.h b/libraries/AP_Proximity/AP_Proximity_config.h new file mode 100644 index 0000000000..92e87818bd --- /dev/null +++ b/libraries/AP_Proximity/AP_Proximity_config.h @@ -0,0 +1,7 @@ +#pragma once + +#include + +#ifndef HAL_PROXIMITY_ENABLED +#define HAL_PROXIMITY_ENABLED (!HAL_MINIMIZE_FEATURES && BOARD_FLASH_SIZE > 1024) +#endif diff --git a/libraries/AP_Proximity/LogStructure.h b/libraries/AP_Proximity/LogStructure.h index 809a35c3c0..3f13268fd4 100644 --- a/libraries/AP_Proximity/LogStructure.h +++ b/libraries/AP_Proximity/LogStructure.h @@ -1,6 +1,7 @@ #pragma once #include +#include "AP_Proximity_config.h" #define LOG_IDS_FROM_PROXIMITY \ LOG_PROXIMITY_MSG, \ @@ -70,8 +71,12 @@ struct PACKED log_Proximity_raw { }; +#if HAL_PROXIMITY_ENABLED #define LOG_STRUCTURE_FROM_PROXIMITY \ { LOG_PROXIMITY_MSG, sizeof(log_Proximity), \ "PRX", "QBBfffffffffff", "TimeUS,Layer,He,D0,D45,D90,D135,D180,D225,D270,D315,DUp,CAn,CDis", "s#-mmmmmmmmmhm", "F--00000000000", true }, \ { LOG_RAW_PROXIMITY_MSG, sizeof(log_Proximity_raw), \ "PRXR", "QBffffffff", "TimeUS,Layer,D0,D45,D90,D135,D180,D225,D270,D315", "s#mmmmmmmm", "F-00000000", true }, +#else +#define LOG_STRUCTURE_FROM_PROXIMITY +#endif