From 20f504d33717eff317d1acfe7759133cb446c0d8 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 20 Jan 2023 00:00:17 +1100
Subject: [PATCH] AP_VideoTX: add and use AP_VIDEOTX_ENABLED

---
 libraries/AP_VideoTX/AP_SmartAudio.h     |  6 +-----
 libraries/AP_VideoTX/AP_Tramp.h          |  9 +++------
 libraries/AP_VideoTX/AP_VideoTX.cpp      |  5 +++++
 libraries/AP_VideoTX/AP_VideoTX.h        |  6 ++++++
 libraries/AP_VideoTX/AP_VideoTX_config.h | 17 +++++++++++++++++
 5 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 libraries/AP_VideoTX/AP_VideoTX_config.h

diff --git a/libraries/AP_VideoTX/AP_SmartAudio.h b/libraries/AP_VideoTX/AP_SmartAudio.h
index 89b2464b4c..b8d51211ad 100644
--- a/libraries/AP_VideoTX/AP_SmartAudio.h
+++ b/libraries/AP_VideoTX/AP_SmartAudio.h
@@ -15,11 +15,7 @@
 
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
-
-#ifndef HAL_SMARTAUDIO_ENABLED
-#define HAL_SMARTAUDIO_ENABLED !HAL_MINIMIZE_FEATURES
-#endif
+#include "AP_VideoTX_config.h"
 
 #if HAL_SMARTAUDIO_ENABLED
 
diff --git a/libraries/AP_VideoTX/AP_Tramp.h b/libraries/AP_VideoTX/AP_Tramp.h
index 9689548798..efad47fd80 100644
--- a/libraries/AP_VideoTX/AP_Tramp.h
+++ b/libraries/AP_VideoTX/AP_Tramp.h
@@ -17,15 +17,12 @@
 
 #pragma once
 
-#include <AP_HAL/AP_HAL.h>
-#include <AP_OSD/AP_OSD.h>
-
-#ifndef AP_TRAMP_ENABLED
-#define AP_TRAMP_ENABLED OSD_ENABLED && BOARD_FLASH_SIZE>1024 && !HAL_MINIMIZE_FEATURES
-#endif
+#include "AP_VideoTX_config.h"
 
 #if AP_TRAMP_ENABLED
 
+#include <AP_HAL/AP_HAL.h>
+#include <AP_OSD/AP_OSD.h>
 #include <AP_Param/AP_Param.h>
 #include <AP_HAL/utility/RingBuffer.h>
 #include "AP_VideoTX.h"
diff --git a/libraries/AP_VideoTX/AP_VideoTX.cpp b/libraries/AP_VideoTX/AP_VideoTX.cpp
index 33db195150..39d31dba43 100644
--- a/libraries/AP_VideoTX/AP_VideoTX.cpp
+++ b/libraries/AP_VideoTX/AP_VideoTX.cpp
@@ -14,6 +14,9 @@
 */
 
 #include "AP_VideoTX.h"
+
+#if AP_VIDEOTX_ENABLED
+
 #include <AP_RCTelemetry/AP_CRSF_Telem.h>
 #include <GCS_MAVLink/GCS.h>
 
@@ -540,3 +543,5 @@ namespace AP {
         return *AP_VideoTX::get_singleton();
     }
 };
+
+#endif
diff --git a/libraries/AP_VideoTX/AP_VideoTX.h b/libraries/AP_VideoTX/AP_VideoTX.h
index 49e008d0b1..4ffa6c21ab 100644
--- a/libraries/AP_VideoTX/AP_VideoTX.h
+++ b/libraries/AP_VideoTX/AP_VideoTX.h
@@ -14,6 +14,10 @@
 */
 #pragma once
 
+#include "AP_VideoTX_config.h"
+
+#if AP_VIDEOTX_ENABLED
+
 #include <AP_Param/AP_Param.h>
 
 #define VTX_MAX_CHANNELS 8
@@ -195,3 +199,5 @@ private:
 namespace AP {
     AP_VideoTX& vtx();
 };
+
+#endif  // AP_VIDEOTX_ENABLED
diff --git a/libraries/AP_VideoTX/AP_VideoTX_config.h b/libraries/AP_VideoTX/AP_VideoTX_config.h
new file mode 100644
index 0000000000..d3304663f6
--- /dev/null
+++ b/libraries/AP_VideoTX/AP_VideoTX_config.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <AP_HAL/AP_HAL_Boards.h>
+#include <AP_OSD/AP_OSD.h>
+
+#ifndef AP_VIDEOTX_ENABLED
+#define AP_VIDEOTX_ENABLED 1
+#endif
+
+#ifndef AP_TRAMP_ENABLED
+#define AP_TRAMP_ENABLED AP_VIDEOTX_ENABLED && OSD_ENABLED && BOARD_FLASH_SIZE>1024 && !HAL_MINIMIZE_FEATURES
+#endif
+
+#ifndef HAL_SMARTAUDIO_ENABLED
+#define HAL_SMARTAUDIO_ENABLED AP_VIDEOTX_ENABLED && !HAL_MINIMIZE_FEATURES
+#endif
+