[VTX] Remove VTX_COMMON which is always defined

src/main/cms/cms_menu_osd.c

@@ -166,9 +166,7 @@ static const OSD_Entry menuOsdElemsEntries[] =
     OSD_ELEMENT_ENTRY("THR. (MANU)", OSD_THROTTLE_POS),
     OSD_ELEMENT_ENTRY("THR. (MANU/AUTO)", OSD_THROTTLE_POS_AUTO_THR),
     OSD_ELEMENT_ENTRY("SYS MESSAGES", OSD_MESSAGES),
-#ifdef USE_VTX_COMMON
     OSD_ELEMENT_ENTRY("VTX CHAN", OSD_VTX_CHANNEL),
-#endif // VTX
     OSD_ELEMENT_ENTRY("CURRENT (A)", OSD_CURRENT_DRAW),
     OSD_ELEMENT_ENTRY("POWER", OSD_POWER),
     OSD_ELEMENT_ENTRY("USED MAH", OSD_MAH_DRAWN),
@@ -252,7 +250,7 @@ static const OSD_Entry menuOsdElemsEntries[] =
     OSD_END_ENTRY,
 };
 
-#if defined(USE_VTX_COMMON) && defined(USE_GPS) && defined(USE_BARO) && defined(USE_PITOT)
+#if defined(USE_GPS) && defined(USE_BARO) && defined(USE_PITOT)
 // All CMS OSD elements should be enabled in this case. The menu has 3 extra
 // elements (label, back and end), but there's an OSD element that we intentionally
 // don't show here (OSD_DEBUG).

src/main/drivers/vtx_common.c

@@ -25,8 +25,6 @@
 #include "platform.h"
 #include "build/debug.h"
 
-#if defined(USE_VTX_COMMON)
-
 #include "vtx_common.h"
 
 static vtxDevice_t *commonVtxDevice = NULL;
@@ -152,4 +150,3 @@ bool vtxCommonGetDeviceCapability(vtxDevice_t *vtxDevice, vtxDeviceCapability_t
     }
     return false;
 }
-#endif

src/main/fc/fc_init.c

@@ -637,13 +637,10 @@ void init(void)
     pitotStartCalibration();
 #endif
 
-#if defined(USE_VTX_COMMON) && defined(USE_VTX_CONTROL)
+#if defined(USE_VTX_CONTROL)
     vtxControlInit();
-
-#if defined(USE_VTX_COMMON)
     vtxCommonInit();
     vtxInit();
-#endif
 
 #ifdef USE_VTX_SMARTAUDIO
     vtxSmartAudioInit();
@@ -653,7 +650,11 @@ void init(void)
     vtxTrampInit();
 #endif
 
-#endif // USE_VTX_COMMON && USE_VTX_CONTROL
+#ifdef USE_VTX_FFPV
+    vtxTrampInit();
+#endif
+
+#endif // USE_VTX_CONTROL
 
     // Now that everything has powered up the voltage and cell count be determined.
     if (feature(FEATURE_VBAT | FEATURE_CURRENT_METER))

src/main/fc/fc_msp.c

@@ -1280,7 +1280,6 @@ static bool mspFcProcessOutCommand(uint16_t cmdMSP, sbuf_t *dst, mspPostProcessF
         }
         break;
 
-#if defined(USE_VTX_COMMON)
     case MSP_VTX_CONFIG:
         {
             vtxDevice_t *vtxDevice = vtxCommonDevice();
@@ -1309,7 +1308,6 @@ static bool mspFcProcessOutCommand(uint16_t cmdMSP, sbuf_t *dst, mspPostProcessF
             }
         }
         break;
-#endif
 
     case MSP_NAME:
         {
@@ -2158,7 +2156,6 @@ static mspResult_e mspFcProcessInCommand(uint16_t cmdMSP, sbuf_t *src)
         break;
 #endif // USE_OSD
 
-#if defined(USE_VTX_COMMON)
     case MSP_SET_VTX_CONFIG:
         if (dataSize >= 2) {
             vtxDevice_t *vtxDevice = vtxCommonDevice();
@@ -2197,7 +2194,6 @@ static mspResult_e mspFcProcessInCommand(uint16_t cmdMSP, sbuf_t *src)
             return MSP_RESULT_ERROR;
         }
         break;
-#endif
 
 #ifdef USE_FLASHFS
     case MSP_DATAFLASH_ERASE:

src/main/fc/fc_tasks.c

@@ -531,7 +531,7 @@ cfTask_t cfTasks[TASK_COUNT] = {
     },
 #endif
 
-#if defined(USE_VTX_COMMON) && defined(USE_VTX_CONTROL)
+#if defined(USE_VTX_CONTROL)
     [TASK_VTXCTRL] = {
         .taskName = "VTXCTRL",
         .taskFunc = vtxUpdate,

src/main/fc/settings.yaml

@@ -1697,7 +1697,7 @@ groups:
   - name: PG_VTX_CONFIG
     type: vtxConfig_t
     headers: ["io/vtx_control.h"]
-    condition: USE_VTX_CONTROL && USE_VTX_COMMON
+    condition: USE_VTX_CONTROL
     members:
       - name: vtx_halfduplex
         field: halfDuplex
@@ -1706,7 +1706,6 @@ groups:
   - name: PG_VTX_SETTINGS_CONFIG
     type: vtxSettingsConfig_t
     headers: ["drivers/vtx_common.h", "io/vtx.h"]
-    condition: USE_VTX_COMMON
     members:
       - name: vtx_band
         field: band

src/main/io/osd.c

@@ -1588,7 +1588,6 @@ static bool osdDrawSingleElement(uint8_t item)
         break;
     }
 
-#if defined(VTX) || defined(USE_VTX_COMMON)
     case OSD_VTX_CHANNEL:
 #if defined(VTX)
         // FIXME: This doesn't actually work. It's for boards with
@@ -1616,7 +1615,6 @@ static bool osdDrawSingleElement(uint8_t item)
         }
 #endif
         break;
-#endif // VTX || VTX_COMMON
 
     case OSD_CROSSHAIRS:
         osdCrosshairsBounds(&elemPosX, &elemPosY, NULL);

src/main/io/vtx.c

@@ -23,8 +23,6 @@
 
 #include "platform.h"
 
-#if defined(USE_VTX_COMMON)
-
 #include "common/maths.h"
 #include "common/time.h"
 
@@ -275,5 +273,3 @@ void vtxUpdate(timeUs_t currentTimeUs)
         }
     }
 }
-
-#endif

src/main/io/vtx_control.c

@@ -37,7 +37,7 @@
 #include "io/vtx_control.h"
 
 
-#if defined(USE_VTX_CONTROL) && defined(USE_VTX_COMMON)
+#if defined(USE_VTX_CONTROL)
 
 PG_REGISTER_WITH_RESET_TEMPLATE(vtxConfig_t, vtxConfig, PG_VTX_CONFIG, 2);
 

src/main/io/vtx_smartaudio.c

@@ -63,13 +63,10 @@ serialPort_t *debugSerialPort = NULL;
 
 static serialPort_t *smartAudioSerialPort = NULL;
 
-#if defined(USE_CMS) || defined(USE_VTX_COMMON)
 const char * const saPowerNames[VTX_SMARTAUDIO_POWER_COUNT+1] = {
     "---", "25 ", "200", "500", "800",
 };
-#endif
 
-#ifdef USE_VTX_COMMON
 static const vtxVTable_t saVTable;    // Forward
 static vtxDevice_t vtxSmartAudio = {
     .vTable = &saVTable,
@@ -80,7 +77,6 @@ static vtxDevice_t vtxSmartAudio = {
     .channelNames = (char **)vtx58ChannelNames,
     .powerNames = (char **)saPowerNames,
 };
-#endif
 
 // SmartAudio command and response codes
 enum {
@@ -340,10 +336,6 @@ static void saProcessResponse(uint8_t *buf, int len)
     }
     saDevicePrev = saDevice;
 
-#ifdef USE_VTX_COMMON
-    // Todo: Update states in saVtxDevice?
-#endif
-
 #ifdef USE_CMS
     // Export current device status for CMS
     saCmsUpdate();
@@ -671,12 +663,7 @@ bool vtxSmartAudioInit(void)
     serialPortConfig_t *portConfig = findSerialPortConfig(FUNCTION_VTX_SMARTAUDIO);
     if (portConfig) {
         portOptions_t portOptions = SERIAL_BIDIR_NOPULL;
-#if defined(USE_VTX_COMMON)
         portOptions = portOptions | (vtxConfig()->halfDuplex ? SERIAL_BIDIR | SERIAL_BIDIR_PP : SERIAL_UNIDIR);
-#else
-        portOptions = SERIAL_BIDIR;
-#endif
-
         smartAudioSerialPort = openSerialPort(portConfig->identifier, FUNCTION_VTX_SMARTAUDIO, NULL, NULL, 4800, MODE_RXTX, portOptions);
     }
 
@@ -766,7 +753,6 @@ static void vtxSAProcess(vtxDevice_t *vtxDevice, timeUs_t currentTimeUs)
     }
 }
 
-#ifdef USE_VTX_COMMON
 // Interface to common VTX API
 
 vtxDevType_e vtxSAGetDeviceType(const vtxDevice_t *vtxDevice)
@@ -893,7 +879,6 @@ static const vtxVTable_t saVTable = {
     .getPitMode = vtxSAGetPitMode,
     .getFrequency = vtxSAGetFreq,
 };
-#endif // VTX_COMMON
 
 
 #endif // VTX_SMARTAUDIO

src/main/io/vtx_string.c

@@ -25,8 +25,6 @@
 #include "platform.h"
 #include "build/debug.h"
 
-#if defined(USE_VTX_COMMON)
-
 #define VTX_STRING_BAND_COUNT 5
 #define VTX_STRING_CHAN_COUNT 8
 
@@ -89,5 +87,3 @@ uint16_t vtx58_Bandchan2Freq(uint8_t band, uint8_t channel)
     }
     return 0;
 }
-
-#endif

src/main/io/vtx_tramp.c

@@ -44,7 +44,7 @@
 #include "io/vtx.h"
 #include "io/vtx_string.h"
 
-#if defined(USE_CMS) || defined(USE_VTX_COMMON)
+#if defined(USE_CMS)
 const uint16_t trampPowerTable[VTX_TRAMP_POWER_COUNT] = {
     25, 100, 200, 400, 600
 };
@@ -52,9 +52,7 @@ const uint16_t trampPowerTable[VTX_TRAMP_POWER_COUNT] = {
 const char * const trampPowerNames[VTX_TRAMP_POWER_COUNT+1] = {
     "---", "25 ", "100", "200", "400", "600"
 };
-#endif
 
-#if defined(USE_VTX_COMMON)
 static const vtxVTable_t trampVTable; // forward
 static vtxDevice_t vtxTramp = {
     .vTable = &trampVTable,
@@ -65,7 +63,6 @@ static vtxDevice_t vtxTramp = {
     .channelNames = (char **)vtx58ChannelNames,
     .powerNames = (char **)trampPowerNames,
 };
-#endif
 
 static serialPort_t *trampSerialPort = NULL;
 
@@ -479,8 +476,6 @@ static void vtxTrampProcess(vtxDevice_t *vtxDevice, timeUs_t currentTimeUs)
 }
 
 
-#ifdef USE_VTX_COMMON
-
 // Interface to common VTX API
 
 static vtxDevType_e vtxTrampGetDeviceType(const vtxDevice_t *vtxDevice)
@@ -588,7 +583,6 @@ static const vtxVTable_t trampVTable = {
     .getFrequency = vtxTrampGetFreq,
 };
 
-#endif
 
 bool vtxTrampInit(void)
 {
@@ -596,11 +590,7 @@ bool vtxTrampInit(void)
 
     if (portConfig) {
         portOptions_t portOptions = 0;
-#if defined(USE_VTX_COMMON)
         portOptions = portOptions | (vtxConfig()->halfDuplex ? SERIAL_BIDIR : SERIAL_UNIDIR);
-#else
-        portOptions = SERIAL_BIDIR;
-#endif
 
         trampSerialPort = openSerialPort(portConfig->identifier, FUNCTION_VTX_TRAMP, NULL, NULL, 9600, MODE_RXTX, portOptions);
     }
@@ -609,9 +599,7 @@ bool vtxTrampInit(void)
         return false;
     }
 
-#if defined(USE_VTX_COMMON)
     vtxCommonSetDevice(&vtxTramp);
-#endif
 
     return true;
 }

src/main/target/common.h

@@ -133,7 +133,6 @@
 #define USE_PITOT_ADC
 
 //Enable VTX control
-#define USE_VTX_COMMON
 #define USE_VTX_CONTROL
 #define USE_VTX_SMARTAUDIO
 #define USE_VTX_TRAMP