From 465357e71528d5cdb89b57dbfa27f17a59a0ccff Mon Sep 17 00:00:00 2001
From: Andy Piper <github@andypiper.com>
Date: Sat, 19 Sep 2020 09:39:57 +0100
Subject: [PATCH] AP_ADSB: conditionally compile based on HAL_ADSB_ENABLED

---
 libraries/AP_ADSB/AP_ADSB.cpp          |  4 ++++
 libraries/AP_ADSB/AP_ADSB.h            | 10 ++++++++++
 libraries/AP_ADSB/AP_ADSB_Backend.cpp  |  3 +++
 libraries/AP_ADSB/AP_ADSB_Backend.h    |  4 ++++
 libraries/AP_ADSB/AP_ADSB_MAVLink.cpp  |  3 +++
 libraries/AP_ADSB/AP_ADSB_MAVLink.h    |  4 ++++
 libraries/AP_ADSB/AP_ADSB_Sagetech.cpp |  5 +++++
 libraries/AP_ADSB/AP_ADSB_Sagetech.h   |  3 +++
 8 files changed, 36 insertions(+)

diff --git a/libraries/AP_ADSB/AP_ADSB.cpp b/libraries/AP_ADSB/AP_ADSB.cpp
index 9db47650cd..e35e3b6b00 100644
--- a/libraries/AP_ADSB/AP_ADSB.cpp
+++ b/libraries/AP_ADSB/AP_ADSB.cpp
@@ -21,6 +21,7 @@
 */
 
 #include "AP_ADSB.h"
+#if HAL_ADSB_ENABLED
 #include "AP_ADSB_Sagetech.h"
 #include "AP_ADSB_MAVLink.h"
 #include <stdio.h>  // for sprintf
@@ -833,3 +834,6 @@ AP_ADSB *AP::ADSB()
     return AP_ADSB::get_singleton();
 }
 
+#endif // HAL_ADSB_ENABLED
+
+
diff --git a/libraries/AP_ADSB/AP_ADSB.h b/libraries/AP_ADSB/AP_ADSB.h
index bda176be13..a90b6b3724 100644
--- a/libraries/AP_ADSB/AP_ADSB.h
+++ b/libraries/AP_ADSB/AP_ADSB.h
@@ -22,11 +22,18 @@
 */
 
 #include <AP_HAL/AP_HAL.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 #include <AP_Common/AP_Common.h>
 #include <AP_Param/AP_Param.h>
 #include <AP_Common/Location.h>
 #include <GCS_MAVLink/GCS_MAVLink.h>
 
+#ifndef HAL_ADSB_ENABLED
+#define HAL_ADSB_ENABLED !HAL_MINIMIZE_FEATURES && BOARD_FLASH_SIZE > 1024
+#endif
+
+#if HAL_ADSB_ENABLED
+
 #define ADSB_BITBASK_RF_CAPABILITIES_UAT_IN         (1 << 0)
 #define ADSB_BITBASK_RF_CAPABILITIES_1090ES_IN      (1 << 1)
 
@@ -222,3 +229,6 @@ private:
 namespace AP {
     AP_ADSB *ADSB();
 };
+
+#endif // HAL_ADSB_ENABLED
+
diff --git a/libraries/AP_ADSB/AP_ADSB_Backend.cpp b/libraries/AP_ADSB/AP_ADSB_Backend.cpp
index 856f40be55..de4d06996c 100644
--- a/libraries/AP_ADSB/AP_ADSB_Backend.cpp
+++ b/libraries/AP_ADSB/AP_ADSB_Backend.cpp
@@ -15,6 +15,7 @@
 
 #include "AP_ADSB_Backend.h"
 
+#if HAL_ADSB_ENABLED
 /*
   base class constructor.
   This incorporates initialisation as well.
@@ -24,3 +25,5 @@ AP_ADSB_Backend::AP_ADSB_Backend(AP_ADSB &_frontend) :
 {
 }
 
+#endif // HAL_ADSB_ENABLED
+
diff --git a/libraries/AP_ADSB/AP_ADSB_Backend.h b/libraries/AP_ADSB/AP_ADSB_Backend.h
index 80f318c00d..26344b3b72 100644
--- a/libraries/AP_ADSB/AP_ADSB_Backend.h
+++ b/libraries/AP_ADSB/AP_ADSB_Backend.h
@@ -16,6 +16,8 @@
 
 #include "AP_ADSB.h"
 
+#if HAL_ADSB_ENABLED
+
 class AP_ADSB_Backend
 {
 public:
@@ -41,3 +43,5 @@ protected:
 private:
 
 };
+
+#endif // HAL_ADSB_ENABLED
diff --git a/libraries/AP_ADSB/AP_ADSB_MAVLink.cpp b/libraries/AP_ADSB/AP_ADSB_MAVLink.cpp
index 3c1f49df04..f7753cc633 100644
--- a/libraries/AP_ADSB/AP_ADSB_MAVLink.cpp
+++ b/libraries/AP_ADSB/AP_ADSB_MAVLink.cpp
@@ -15,6 +15,8 @@
 
 #include "AP_ADSB_MAVLink.h"
 
+#if HAL_ADSB_ENABLED
+
 #include <limits.h>
 #include <AP_Vehicle/AP_Vehicle.h>
 #include <GCS_MAVLink/GCS.h>
@@ -274,3 +276,4 @@ uint32_t AP_ADSB_MAVLink::get_encoded_icao(void)
     return encoded_icao;
 }
 
+#endif // HAL_ADSB_ENABLED
diff --git a/libraries/AP_ADSB/AP_ADSB_MAVLink.h b/libraries/AP_ADSB/AP_ADSB_MAVLink.h
index 63ea7e5dc0..6f15538b3b 100644
--- a/libraries/AP_ADSB/AP_ADSB_MAVLink.h
+++ b/libraries/AP_ADSB/AP_ADSB_MAVLink.h
@@ -17,6 +17,8 @@
 
 #include "AP_ADSB_Backend.h"
 
+#if HAL_ADSB_ENABLED
+
 class AP_ADSB_MAVLink : public AP_ADSB_Backend {
 public:
     // constructor
@@ -44,3 +46,5 @@ private:
     int8_t              _chan = -1;
 };
 
+#endif // HAL_ADSB_ENABLED
+
diff --git a/libraries/AP_ADSB/AP_ADSB_Sagetech.cpp b/libraries/AP_ADSB/AP_ADSB_Sagetech.cpp
index 682cbe26b1..04ff600a48 100644
--- a/libraries/AP_ADSB/AP_ADSB_Sagetech.cpp
+++ b/libraries/AP_ADSB/AP_ADSB_Sagetech.cpp
@@ -14,6 +14,9 @@
  */
 
 #include "AP_ADSB_Sagetech.h"
+
+#if HAL_ADSB_ENABLED
+
 #include <GCS_MAVLink/GCS.h>
 #include <AP_AHRS/AP_AHRS.h>
 #include <AP_RTC/AP_RTC.h>
@@ -748,4 +751,6 @@ const char* AP_ADSB_Sagetech::systemStatsBits_to_str(const SystemStateBits syste
     }
 }
 
+#endif // HAL_ADSB_ENABLED
+
 
diff --git a/libraries/AP_ADSB/AP_ADSB_Sagetech.h b/libraries/AP_ADSB/AP_ADSB_Sagetech.h
index 4fc3b77425..e10e84bc70 100644
--- a/libraries/AP_ADSB/AP_ADSB_Sagetech.h
+++ b/libraries/AP_ADSB/AP_ADSB_Sagetech.h
@@ -17,6 +17,8 @@
 
 #include "AP_ADSB_Backend.h"
 
+#if HAL_ADSB_ENABLED
+
 class AP_ADSB_Sagetech : public AP_ADSB_Backend {
 public:
     // constructor
@@ -148,3 +150,4 @@ private:
     Transponder_Type transponder_type = Transponder_Type::Unknown;
 };
 
+#endif // HAL_ADSB_ENABLED