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

AP_Proximity: move to config.h pattern and only include log structures if enabled

This commit is contained in:
Iampete1 2022-07-12 01:48:35 +01:00 committed by Andrew Tridgell
parent db9b57c0a3
commit 68b7293d9a
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Proximity/AP_Proximity.h
View File

@ -14,11 +14,7 @@
*/
#pragma once
#include <AP_HAL/AP_HAL_Boards.h>
#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

7
libraries/AP_Proximity/AP_Proximity_config.h Normal file
View File

@ -0,0 +1,7 @@
#pragma once
#include <AP_HAL/AP_HAL_Boards.h>
#ifndef HAL_PROXIMITY_ENABLED
#define HAL_PROXIMITY_ENABLED (!HAL_MINIMIZE_FEATURES && BOARD_FLASH_SIZE > 1024)
#endif

5
libraries/AP_Proximity/LogStructure.h
View File

@ -1,6 +1,7 @@
#pragma once
#include <AP_Logger/LogStructure.h>
#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