From 35daf81c27f860b4ee3f46d14e8a2495112c4ef9 Mon Sep 17 00:00:00 2001
From: Tom Pittenger <tom.pittenger@krausaerospace.com>
Date: Tue, 24 Jan 2023 20:38:45 -0800
Subject: [PATCH] AP_ADSB: create AP_ADSB_config.h

---
 libraries/AP_ADSB/AP_ADSB.h                  |  6 +----
 libraries/AP_ADSB/AP_ADSB_Sagetech.h         |  4 ----
 libraries/AP_ADSB/AP_ADSB_Sagetech_MXS.h     |  5 ----
 libraries/AP_ADSB/AP_ADSB_config.h           | 25 ++++++++++++++++++++
 libraries/AP_ADSB/AP_ADSB_uAvionix_MAVLink.h |  4 ----
 libraries/AP_ADSB/AP_ADSB_uAvionix_UCP.h     |  4 ----
 6 files changed, 26 insertions(+), 22 deletions(-)
 create mode 100644 libraries/AP_ADSB/AP_ADSB_config.h

diff --git a/libraries/AP_ADSB/AP_ADSB.h b/libraries/AP_ADSB/AP_ADSB.h
index ca0e0eeae3..fb204f170a 100644
--- a/libraries/AP_ADSB/AP_ADSB.h
+++ b/libraries/AP_ADSB/AP_ADSB.h
@@ -21,11 +21,7 @@
   Tom Pittenger, November 2015
 */
 
-#include <AP_HAL/AP_HAL_Boards.h>
-
-#ifndef HAL_ADSB_ENABLED
-#define HAL_ADSB_ENABLED !HAL_MINIMIZE_FEATURES && BOARD_FLASH_SIZE > 1024
-#endif
+#include "AP_ADSB_config.h"
 
 #if HAL_ADSB_ENABLED
 #include <AP_Common/AP_Common.h>
diff --git a/libraries/AP_ADSB/AP_ADSB_Sagetech.h b/libraries/AP_ADSB/AP_ADSB_Sagetech.h
index ee84f5260e..afe61b0b1c 100644
--- a/libraries/AP_ADSB/AP_ADSB_Sagetech.h
+++ b/libraries/AP_ADSB/AP_ADSB_Sagetech.h
@@ -17,10 +17,6 @@
 
 #include "AP_ADSB_Backend.h"
 
-#ifndef HAL_ADSB_SAGETECH_ENABLED
-#define HAL_ADSB_SAGETECH_ENABLED HAL_ADSB_ENABLED
-#endif
-
 #if HAL_ADSB_SAGETECH_ENABLED
 class AP_ADSB_Sagetech : public AP_ADSB_Backend {
 public:
diff --git a/libraries/AP_ADSB/AP_ADSB_Sagetech_MXS.h b/libraries/AP_ADSB/AP_ADSB_Sagetech_MXS.h
index ec669cf39d..5ba13cfc04 100644
--- a/libraries/AP_ADSB/AP_ADSB_Sagetech_MXS.h
+++ b/libraries/AP_ADSB/AP_ADSB_Sagetech_MXS.h
@@ -24,11 +24,6 @@
 
 #include "AP_ADSB_Backend.h"
 
-#ifndef HAL_ADSB_SAGETECH_MXS_ENABLED
-    // this feature is only enabled by default by select hardware
-    #define HAL_ADSB_SAGETECH_MXS_ENABLED HAL_ADSB_ENABLED && CONFIG_HAL_BOARD == HAL_BOARD_SITL
-#endif
-
 #if HAL_ADSB_SAGETECH_MXS_ENABLED
 
 #include "sagetech-sdk/sagetech_mxs.h"
diff --git a/libraries/AP_ADSB/AP_ADSB_config.h b/libraries/AP_ADSB/AP_ADSB_config.h
new file mode 100644
index 0000000000..e686984286
--- /dev/null
+++ b/libraries/AP_ADSB/AP_ADSB_config.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <AP_HAL/AP_HAL_Boards.h>
+
+
+#ifndef HAL_ADSB_ENABLED
+#define HAL_ADSB_ENABLED !HAL_MINIMIZE_FEATURES && BOARD_FLASH_SIZE > 1024
+#endif
+
+#ifndef HAL_ADSB_UAVIONIX_MAVLINK_ENABLED
+#define HAL_ADSB_UAVIONIX_MAVLINK_ENABLED HAL_ADSB_ENABLED
+#endif
+
+#ifndef HAL_ADSB_SAGETECH_ENABLED
+#define HAL_ADSB_SAGETECH_ENABLED HAL_ADSB_ENABLED
+#endif
+
+#ifndef HAL_ADSB_UCP_ENABLED
+#define HAL_ADSB_UCP_ENABLED HAL_ADSB_ENABLED
+#endif
+
+#ifndef HAL_ADSB_SAGETECH_MXS_ENABLED
+    // this feature is only enabled by default by select hardware
+    #define HAL_ADSB_SAGETECH_MXS_ENABLED HAL_ADSB_ENABLED && CONFIG_HAL_BOARD == HAL_BOARD_SITL
+#endif
diff --git a/libraries/AP_ADSB/AP_ADSB_uAvionix_MAVLink.h b/libraries/AP_ADSB/AP_ADSB_uAvionix_MAVLink.h
index 59ec7f3d7e..6eb85caa5c 100644
--- a/libraries/AP_ADSB/AP_ADSB_uAvionix_MAVLink.h
+++ b/libraries/AP_ADSB/AP_ADSB_uAvionix_MAVLink.h
@@ -17,10 +17,6 @@
 
 #include "AP_ADSB_Backend.h"
 
-#ifndef HAL_ADSB_UAVIONIX_MAVLINK_ENABLED
-#define HAL_ADSB_UAVIONIX_MAVLINK_ENABLED HAL_ADSB_ENABLED
-#endif
-
 #if HAL_ADSB_UAVIONIX_MAVLINK_ENABLED
 class AP_ADSB_uAvionix_MAVLink : public AP_ADSB_Backend {
 public:
diff --git a/libraries/AP_ADSB/AP_ADSB_uAvionix_UCP.h b/libraries/AP_ADSB/AP_ADSB_uAvionix_UCP.h
index 9b8397bfb4..7b32a5cc2e 100644
--- a/libraries/AP_ADSB/AP_ADSB_uAvionix_UCP.h
+++ b/libraries/AP_ADSB/AP_ADSB_uAvionix_UCP.h
@@ -20,10 +20,6 @@
 #pragma once
 #include "AP_ADSB_Backend.h"
 
-#ifndef HAL_ADSB_UCP_ENABLED
-#define HAL_ADSB_UCP_ENABLED HAL_ADSB_ENABLED
-#endif
-
 #if HAL_ADSB_UCP_ENABLED
 
 #define AP_ADSB_UAVIONIX_UCP_CAPTURE_ALL_RX_PACKETS         1