mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-15 20:35:33 +03:00
Converted defines for VTX_COMMON
, VTX_CONTROL
, VTX_RTC6705
, VTX_RTC6705SOFTSPI
, VTX_TRAMP
, VTX_SMARTAUDIO
to use USE_
prefix.
This commit is contained in:
parent
ce2c3e28bd
commit
385623bd9d
40 changed files with 101 additions and 101 deletions
|
@ -101,14 +101,14 @@ static OSD_Entry menuFeaturesEntries[] =
|
||||||
#if defined(USE_BLACKBOX)
|
#if defined(USE_BLACKBOX)
|
||||||
{"BLACKBOX", OME_Submenu, cmsMenuChange, &cmsx_menuBlackbox, 0},
|
{"BLACKBOX", OME_Submenu, cmsMenuChange, &cmsx_menuBlackbox, 0},
|
||||||
#endif
|
#endif
|
||||||
#if defined(VTX_CONTROL)
|
#if defined(USE_VTX_CONTROL)
|
||||||
#if defined(VTX_RTC6705)
|
#if defined(USE_VTX_RTC6705)
|
||||||
{"VTX", OME_Submenu, cmsMenuChange, &cmsx_menuVtxRTC6705, 0},
|
{"VTX", OME_Submenu, cmsMenuChange, &cmsx_menuVtxRTC6705, 0},
|
||||||
#endif // VTX_RTC6705
|
#endif // VTX_RTC6705
|
||||||
#if defined(VTX_SMARTAUDIO)
|
#if defined(USE_VTX_SMARTAUDIO)
|
||||||
{"VTX SA", OME_Submenu, cmsMenuChange, &cmsx_menuVtxSmartAudio, 0},
|
{"VTX SA", OME_Submenu, cmsMenuChange, &cmsx_menuVtxSmartAudio, 0},
|
||||||
#endif
|
#endif
|
||||||
#if defined(VTX_TRAMP)
|
#if defined(USE_VTX_TRAMP)
|
||||||
{"VTX TR", OME_Submenu, cmsMenuChange, &cmsx_menuVtxTramp, 0},
|
{"VTX TR", OME_Submenu, cmsMenuChange, &cmsx_menuVtxTramp, 0},
|
||||||
#endif
|
#endif
|
||||||
#endif // VTX_CONTROL
|
#endif // VTX_CONTROL
|
||||||
|
|
|
@ -72,7 +72,7 @@ OSD_Entry menuOsdActiveElemsEntries[] =
|
||||||
{"FLY MODE", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_FLYMODE], 0},
|
{"FLY MODE", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_FLYMODE], 0},
|
||||||
{"NAME", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_CRAFT_NAME], 0},
|
{"NAME", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_CRAFT_NAME], 0},
|
||||||
{"THROTTLE", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_THROTTLE_POS], 0},
|
{"THROTTLE", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_THROTTLE_POS], 0},
|
||||||
#ifdef VTX_CONTROL
|
#ifdef USE_VTX_CONTROL
|
||||||
{"VTX CHAN", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_VTX_CHANNEL], 0},
|
{"VTX CHAN", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_VTX_CHANNEL], 0},
|
||||||
#endif // VTX
|
#endif // VTX
|
||||||
{"CURRENT (A)", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_CURRENT_DRAW], 0},
|
{"CURRENT (A)", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_CURRENT_DRAW], 0},
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
|
||||||
#if defined(USE_CMS) && defined(VTX_RTC6705)
|
#if defined(USE_CMS) && defined(USE_VTX_RTC6705)
|
||||||
|
|
||||||
#include "common/printf.h"
|
#include "common/printf.h"
|
||||||
#include "common/utils.h"
|
#include "common/utils.h"
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
|
||||||
#if defined(USE_CMS) && defined(VTX_SMARTAUDIO)
|
#if defined(USE_CMS) && defined(USE_VTX_SMARTAUDIO)
|
||||||
|
|
||||||
#include "common/printf.h"
|
#include "common/printf.h"
|
||||||
#include "common/utils.h"
|
#include "common/utils.h"
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
|
||||||
#if defined(USE_CMS) && defined(VTX_TRAMP)
|
#if defined(USE_CMS) && defined(USE_VTX_TRAMP)
|
||||||
|
|
||||||
#include "common/printf.h"
|
#include "common/printf.h"
|
||||||
#include "common/utils.h"
|
#include "common/utils.h"
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
|
||||||
#if defined(VTX_COMMON)
|
#if defined(USE_VTX_COMMON)
|
||||||
|
|
||||||
#include "common/time.h"
|
#include "common/time.h"
|
||||||
#include "drivers/vtx_common.h"
|
#include "drivers/vtx_common.h"
|
||||||
|
|
|
@ -41,13 +41,13 @@
|
||||||
|
|
||||||
#define VTX_SETTINGS_MAX_FREQUENCY_MHZ 5999 //max freq (in MHz) for 'vtx_freq' setting
|
#define VTX_SETTINGS_MAX_FREQUENCY_MHZ 5999 //max freq (in MHz) for 'vtx_freq' setting
|
||||||
|
|
||||||
#if defined(VTX_RTC6705)
|
#if defined(USE_VTX_RTC6705)
|
||||||
|
|
||||||
#include "drivers/vtx_rtc6705.h"
|
#include "drivers/vtx_rtc6705.h"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(VTX_SMARTAUDIO) || defined(VTX_TRAMP)
|
#if defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_TRAMP)
|
||||||
|
|
||||||
#define VTX_SETTINGS_POWER_COUNT 5
|
#define VTX_SETTINGS_POWER_COUNT 5
|
||||||
#define VTX_SETTINGS_DEFAULT_POWER 1
|
#define VTX_SETTINGS_DEFAULT_POWER 1
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
#define VTX_SETTINGS_MAX_USER_FREQ 5999
|
#define VTX_SETTINGS_MAX_USER_FREQ 5999
|
||||||
#define VTX_SETTINGS_FREQCMD
|
#define VTX_SETTINGS_FREQCMD
|
||||||
|
|
||||||
#elif defined(VTX_RTC6705)
|
#elif defined(USE_VTX_RTC6705)
|
||||||
|
|
||||||
#define VTX_SETTINGS_POWER_COUNT VTX_RTC6705_POWER_COUNT
|
#define VTX_SETTINGS_POWER_COUNT VTX_RTC6705_POWER_COUNT
|
||||||
#define VTX_SETTINGS_DEFAULT_POWER VTX_RTC6705_DEFAULT_POWER
|
#define VTX_SETTINGS_DEFAULT_POWER VTX_RTC6705_DEFAULT_POWER
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
|
||||||
#if defined(VTX_RTC6705) && !defined(VTX_RTC6705SOFTSPI)
|
#if defined(USE_VTX_RTC6705) && !defined(USE_VTX_RTC6705_SOFTSPI)
|
||||||
|
|
||||||
#include "common/maths.h"
|
#include "common/maths.h"
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
|
||||||
#if defined(VTX_RTC6705) && defined(VTX_RTC6705SOFTSPI)
|
#if defined(USE_VTX_RTC6705) && defined(USE_VTX_RTC6705_SOFTSPI)
|
||||||
|
|
||||||
#include "drivers/bus_spi.h"
|
#include "drivers/bus_spi.h"
|
||||||
#include "drivers/io.h"
|
#include "drivers/io.h"
|
||||||
|
|
|
@ -379,10 +379,10 @@ void updateMagHold(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_CONTROL
|
#ifdef USE_VTX_CONTROL
|
||||||
static bool canUpdateVTX(void)
|
static bool canUpdateVTX(void)
|
||||||
{
|
{
|
||||||
#ifdef VTX_RTC6705
|
#ifdef USE_VTX_RTC6705
|
||||||
return vtxRTC6705CanUpdate();
|
return vtxRTC6705CanUpdate();
|
||||||
#endif
|
#endif
|
||||||
return true;
|
return true;
|
||||||
|
@ -591,7 +591,7 @@ void processRx(timeUs_t currentTimeUs)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_CONTROL
|
#ifdef USE_VTX_CONTROL
|
||||||
vtxUpdateActivatedChannel();
|
vtxUpdateActivatedChannel();
|
||||||
|
|
||||||
if (canUpdateVTX()) {
|
if (canUpdateVTX()) {
|
||||||
|
|
|
@ -476,7 +476,7 @@ void init(void)
|
||||||
updateHardwareRevision();
|
updateHardwareRevision();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_RTC6705
|
#ifdef USE_VTX_RTC6705
|
||||||
rtc6705IOInit();
|
rtc6705IOInit();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -682,23 +682,23 @@ void init(void)
|
||||||
baroSetCalibrationCycles(CALIBRATING_BARO_CYCLES);
|
baroSetCalibrationCycles(CALIBRATING_BARO_CYCLES);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_CONTROL
|
#ifdef USE_VTX_CONTROL
|
||||||
vtxControlInit();
|
vtxControlInit();
|
||||||
|
|
||||||
#if defined(VTX_COMMON)
|
#if defined(USE_VTX_COMMON)
|
||||||
vtxCommonInit();
|
vtxCommonInit();
|
||||||
vtxInit();
|
vtxInit();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_SMARTAUDIO
|
#ifdef USE_VTX_SMARTAUDIO
|
||||||
vtxSmartAudioInit();
|
vtxSmartAudioInit();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_TRAMP
|
#ifdef USE_VTX_TRAMP
|
||||||
vtxTrampInit();
|
vtxTrampInit();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_RTC6705
|
#ifdef USE_VTX_RTC6705
|
||||||
#ifdef VTX_RTC6705_OPTIONAL
|
#ifdef VTX_RTC6705_OPTIONAL
|
||||||
if (!vtxCommonDeviceRegistered()) // external VTX takes precedence when configured.
|
if (!vtxCommonDeviceRegistered()) // external VTX takes precedence when configured.
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -205,14 +205,14 @@ static void taskTelemetry(timeUs_t currentTimeUs)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_CONTROL
|
#ifdef USE_VTX_CONTROL
|
||||||
// Everything that listens to VTX devices
|
// Everything that listens to VTX devices
|
||||||
void taskVtxControl(timeUs_t currentTime)
|
void taskVtxControl(timeUs_t currentTime)
|
||||||
{
|
{
|
||||||
if (cliMode)
|
if (cliMode)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
#ifdef VTX_COMMON
|
#ifdef USE_VTX_COMMON
|
||||||
vtxProcessSchedule(currentTime);
|
vtxProcessSchedule(currentTime);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -331,8 +331,8 @@ void fcTasksInit(void)
|
||||||
setTaskEnabled(TASK_CMS, feature(FEATURE_OSD) || feature(FEATURE_DASHBOARD));
|
setTaskEnabled(TASK_CMS, feature(FEATURE_OSD) || feature(FEATURE_DASHBOARD));
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#ifdef VTX_CONTROL
|
#ifdef USE_VTX_CONTROL
|
||||||
#if defined(VTX_RTC6705) || defined(VTX_SMARTAUDIO) || defined(VTX_TRAMP)
|
#if defined(USE_VTX_RTC6705) || defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_TRAMP)
|
||||||
setTaskEnabled(TASK_VTXCTRL, true);
|
setTaskEnabled(TASK_VTXCTRL, true);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -569,7 +569,7 @@ cfTask_t cfTasks[TASK_COUNT] = {
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_CONTROL
|
#ifdef USE_VTX_CONTROL
|
||||||
[TASK_VTXCTRL] = {
|
[TASK_VTXCTRL] = {
|
||||||
.taskName = "VTXCTRL",
|
.taskName = "VTXCTRL",
|
||||||
.taskFunc = taskVtxControl,
|
.taskFunc = taskVtxControl,
|
||||||
|
|
|
@ -326,7 +326,7 @@ void processRcStickPositions(throttleStatus_e throttleStatus)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_CONTROL
|
#ifdef USE_VTX_CONTROL
|
||||||
if (rcSticks == THR_HI + YAW_LO + PIT_CE + ROL_HI) {
|
if (rcSticks == THR_HI + YAW_LO + PIT_CE + ROL_HI) {
|
||||||
vtxIncrementBand();
|
vtxIncrementBand();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1858,7 +1858,7 @@ static void cliFlashRead(char *cmdline)
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_CONTROL
|
#ifdef USE_VTX_CONTROL
|
||||||
static void printVtx(uint8_t dumpMask, const vtxConfig_t *vtxConfig, const vtxConfig_t *vtxConfigDefault)
|
static void printVtx(uint8_t dumpMask, const vtxConfig_t *vtxConfig, const vtxConfig_t *vtxConfigDefault)
|
||||||
{
|
{
|
||||||
// print out vtx channel settings
|
// print out vtx channel settings
|
||||||
|
@ -3560,7 +3560,7 @@ static void printConfig(char *cmdline, bool doDiff)
|
||||||
cliPrintHashLine("rxrange");
|
cliPrintHashLine("rxrange");
|
||||||
printRxRange(dumpMask, rxChannelRangeConfigs_CopyArray, rxChannelRangeConfigs(0));
|
printRxRange(dumpMask, rxChannelRangeConfigs_CopyArray, rxChannelRangeConfigs(0));
|
||||||
|
|
||||||
#ifdef VTX_CONTROL
|
#ifdef USE_VTX_CONTROL
|
||||||
cliPrintHashLine("vtx");
|
cliPrintHashLine("vtx");
|
||||||
printVtx(dumpMask, &vtxConfig_Copy, vtxConfig());
|
printVtx(dumpMask, &vtxConfig_Copy, vtxConfig());
|
||||||
#endif
|
#endif
|
||||||
|
@ -3734,7 +3734,7 @@ const clicmd_t cmdTable[] = {
|
||||||
CLI_COMMAND_DEF("tasks", "show task stats", NULL, cliTasks),
|
CLI_COMMAND_DEF("tasks", "show task stats", NULL, cliTasks),
|
||||||
#endif
|
#endif
|
||||||
CLI_COMMAND_DEF("version", "show version", NULL, cliVersion),
|
CLI_COMMAND_DEF("version", "show version", NULL, cliVersion),
|
||||||
#ifdef VTX_CONTROL
|
#ifdef USE_VTX_CONTROL
|
||||||
CLI_COMMAND_DEF("vtx", "vtx channels on switch", NULL, cliVtx),
|
CLI_COMMAND_DEF("vtx", "vtx channels on switch", NULL, cliVtx),
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
|
@ -1206,7 +1206,7 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst)
|
||||||
sbufWriteU8(dst, compassConfig()->mag_hardware);
|
sbufWriteU8(dst, compassConfig()->mag_hardware);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if defined(VTX_COMMON)
|
#if defined(USE_VTX_COMMON)
|
||||||
case MSP_VTX_CONFIG:
|
case MSP_VTX_CONFIG:
|
||||||
{
|
{
|
||||||
uint8_t deviceType = vtxCommonGetDeviceType();
|
uint8_t deviceType = vtxCommonGetDeviceType();
|
||||||
|
@ -1702,7 +1702,7 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_COMMON
|
#ifdef USE_VTX_COMMON
|
||||||
case MSP_SET_VTX_CONFIG:
|
case MSP_SET_VTX_CONFIG:
|
||||||
{
|
{
|
||||||
if (vtxCommonDeviceRegistered()) {
|
if (vtxCommonDeviceRegistered()) {
|
||||||
|
|
|
@ -256,7 +256,7 @@ void initActiveBoxIds(void)
|
||||||
BME(BOXCAMERA3);
|
BME(BOXCAMERA3);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(VTX_SMARTAUDIO) || defined(VTX_TRAMP)
|
#if defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_TRAMP)
|
||||||
BME(BOXVTXPITMODE);
|
BME(BOXVTXPITMODE);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -788,7 +788,7 @@ const clivalue_t valueTable[] = {
|
||||||
{ "pwr_on_arm_grace", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, 30 }, PG_SYSTEM_CONFIG, offsetof(systemConfig_t, powerOnArmingGraceTime) },
|
{ "pwr_on_arm_grace", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, 30 }, PG_SYSTEM_CONFIG, offsetof(systemConfig_t, powerOnArmingGraceTime) },
|
||||||
|
|
||||||
// PG_VTX_CONFIG
|
// PG_VTX_CONFIG
|
||||||
#ifdef VTX_COMMON
|
#ifdef USE_VTX_COMMON
|
||||||
{ "vtx_band", VAR_UINT8 | MASTER_VALUE, .config.minmax = { VTX_SETTINGS_MIN_BAND, VTX_SETTINGS_MAX_BAND }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, band) },
|
{ "vtx_band", VAR_UINT8 | MASTER_VALUE, .config.minmax = { VTX_SETTINGS_MIN_BAND, VTX_SETTINGS_MAX_BAND }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, band) },
|
||||||
{ "vtx_channel", VAR_UINT8 | MASTER_VALUE, .config.minmax = { VTX_SETTINGS_MIN_CHANNEL, VTX_SETTINGS_MAX_CHANNEL }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, channel) },
|
{ "vtx_channel", VAR_UINT8 | MASTER_VALUE, .config.minmax = { VTX_SETTINGS_MIN_CHANNEL, VTX_SETTINGS_MAX_CHANNEL }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, channel) },
|
||||||
{ "vtx_power", VAR_UINT8 | MASTER_VALUE, .config.minmax = { VTX_SETTINGS_MIN_POWER, VTX_SETTINGS_POWER_COUNT-1 }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, power) },
|
{ "vtx_power", VAR_UINT8 | MASTER_VALUE, .config.minmax = { VTX_SETTINGS_MIN_POWER, VTX_SETTINGS_POWER_COUNT-1 }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, power) },
|
||||||
|
@ -800,7 +800,7 @@ const clivalue_t valueTable[] = {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// PG_VTX_CONFIG
|
// PG_VTX_CONFIG
|
||||||
#if defined(VTX_CONTROL) && defined(VTX_COMMON)
|
#if defined(USE_VTX_CONTROL) && defined(USE_VTX_COMMON)
|
||||||
{ "vtx_halfduplex", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_VTX_CONFIG, offsetof(vtxConfig_t, halfDuplex) },
|
{ "vtx_halfduplex", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_VTX_CONFIG, offsetof(vtxConfig_t, halfDuplex) },
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -578,7 +578,7 @@ static void applyLedWarningLayer(bool updateNow, timeUs_t *timer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef VTX_COMMON
|
#ifdef USE_VTX_COMMON
|
||||||
static void applyLedVtxLayer(bool updateNow, timeUs_t *timer)
|
static void applyLedVtxLayer(bool updateNow, timeUs_t *timer)
|
||||||
{
|
{
|
||||||
static uint16_t frequency = 0;
|
static uint16_t frequency = 0;
|
||||||
|
@ -1000,7 +1000,7 @@ typedef enum {
|
||||||
timGps,
|
timGps,
|
||||||
#endif
|
#endif
|
||||||
timWarning,
|
timWarning,
|
||||||
#ifdef VTX_COMMON
|
#ifdef USE_VTX_COMMON
|
||||||
timVtx,
|
timVtx,
|
||||||
#endif
|
#endif
|
||||||
timIndicator,
|
timIndicator,
|
||||||
|
@ -1029,7 +1029,7 @@ static applyLayerFn_timed* layerTable[] = {
|
||||||
[timGps] = &applyLedGpsLayer,
|
[timGps] = &applyLedGpsLayer,
|
||||||
#endif
|
#endif
|
||||||
[timWarning] = &applyLedWarningLayer,
|
[timWarning] = &applyLedWarningLayer,
|
||||||
#ifdef VTX_COMMON
|
#ifdef USE_VTX_COMMON
|
||||||
[timVtx] = &applyLedVtxLayer,
|
[timVtx] = &applyLedVtxLayer,
|
||||||
#endif
|
#endif
|
||||||
[timIndicator] = &applyLedIndicatorLayer,
|
[timIndicator] = &applyLedIndicatorLayer,
|
||||||
|
|
|
@ -506,7 +506,7 @@ static void osdDrawSingleElement(uint8_t item)
|
||||||
tfp_sprintf(buff + 2, "%d", (constrain(rcData[THROTTLE], PWM_RANGE_MIN, PWM_RANGE_MAX) - PWM_RANGE_MIN) * 100 / (PWM_RANGE_MAX - PWM_RANGE_MIN));
|
tfp_sprintf(buff + 2, "%d", (constrain(rcData[THROTTLE], PWM_RANGE_MIN, PWM_RANGE_MAX) - PWM_RANGE_MIN) * 100 / (PWM_RANGE_MAX - PWM_RANGE_MIN));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if defined(VTX_COMMON)
|
#if defined(USE_VTX_COMMON)
|
||||||
case OSD_VTX_CHANNEL:
|
case OSD_VTX_CHANNEL:
|
||||||
{
|
{
|
||||||
const char vtxBandLetter = vtx58BandLetter[vtxSettingsConfig()->band];
|
const char vtxBandLetter = vtx58BandLetter[vtxSettingsConfig()->band];
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
|
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
#if defined(USE_SPEKTRUM_VTX_CONTROL) && defined(VTX_COMMON)
|
#if defined(USE_SPEKTRUM_VTX_CONTROL) && defined(USE_VTX_COMMON)
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
|
||||||
#if defined(VTX_COMMON)
|
#if defined(USE_VTX_COMMON)
|
||||||
|
|
||||||
#include "common/time.h"
|
#include "common/time.h"
|
||||||
#include "common/maths.h"
|
#include "common/maths.h"
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
|
||||||
#if defined(VTX_CONTROL) && defined(VTX_COMMON)
|
#if defined(USE_VTX_CONTROL) && defined(USE_VTX_COMMON)
|
||||||
|
|
||||||
#include "common/maths.h"
|
#include "common/maths.h"
|
||||||
|
|
||||||
|
@ -184,7 +184,7 @@ void vtxCyclePower(const uint8_t powerStep)
|
||||||
*/
|
*/
|
||||||
void handleVTXControlButton(void)
|
void handleVTXControlButton(void)
|
||||||
{
|
{
|
||||||
#if defined(VTX_RTC6705) && defined(BUTTON_A_PIN)
|
#if defined(USE_VTX_RTC6705) && defined(BUTTON_A_PIN)
|
||||||
bool buttonWasPressed = false;
|
bool buttonWasPressed = false;
|
||||||
uint32_t start = millis();
|
uint32_t start = millis();
|
||||||
uint32_t ledToggleAt = start;
|
uint32_t ledToggleAt = start;
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
|
||||||
#if defined(VTX_RTC6705) && defined(VTX_CONTROL)
|
#if defined(USE_VTX_RTC6705) && defined(USE_VTX_CONTROL)
|
||||||
|
|
||||||
#include "build/build_config.h"
|
#include "build/build_config.h"
|
||||||
#include "build/debug.h"
|
#include "build/debug.h"
|
||||||
|
@ -51,13 +51,13 @@
|
||||||
#include "io/vtx_rtc6705.h"
|
#include "io/vtx_rtc6705.h"
|
||||||
#include "io/vtx_string.h"
|
#include "io/vtx_string.h"
|
||||||
|
|
||||||
#if defined(USE_CMS) || defined(VTX_COMMON)
|
#if defined(USE_CMS) || defined(USE_VTX_COMMON)
|
||||||
const char * const rtc6705PowerNames[] = {
|
const char * const rtc6705PowerNames[] = {
|
||||||
"OFF", "MIN", "MAX"
|
"OFF", "MIN", "MAX"
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_COMMON
|
#ifdef USE_VTX_COMMON
|
||||||
static vtxVTable_t rtc6705VTable; // Forward
|
static vtxVTable_t rtc6705VTable; // Forward
|
||||||
static vtxDevice_t vtxRTC6705 = {
|
static vtxDevice_t vtxRTC6705 = {
|
||||||
.vTable = &rtc6705VTable,
|
.vTable = &rtc6705VTable,
|
||||||
|
@ -111,7 +111,7 @@ void vtxRTC6705Process(timeUs_t now)
|
||||||
UNUSED(now);
|
UNUSED(now);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef VTX_COMMON
|
#ifdef USE_VTX_COMMON
|
||||||
// Interface to common VTX API
|
// Interface to common VTX API
|
||||||
|
|
||||||
vtxDevType_e vtxRTC6705GetDeviceType(void)
|
vtxDevType_e vtxRTC6705GetDeviceType(void)
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
|
||||||
#if defined(VTX_SMARTAUDIO) && defined(VTX_CONTROL)
|
#if defined(USE_VTX_SMARTAUDIO) && defined(USE_VTX_CONTROL)
|
||||||
|
|
||||||
#include "build/build_config.h"
|
#include "build/build_config.h"
|
||||||
#include "build/debug.h"
|
#include "build/debug.h"
|
||||||
|
@ -70,13 +70,13 @@ serialPort_t *debugSerialPort = NULL;
|
||||||
|
|
||||||
static serialPort_t *smartAudioSerialPort = NULL;
|
static serialPort_t *smartAudioSerialPort = NULL;
|
||||||
|
|
||||||
#if defined(USE_CMS) || defined(VTX_COMMON)
|
#if defined(USE_CMS) || defined(USE_VTX_COMMON)
|
||||||
const char * const saPowerNames[VTX_SMARTAUDIO_POWER_COUNT+1] = {
|
const char * const saPowerNames[VTX_SMARTAUDIO_POWER_COUNT+1] = {
|
||||||
"---", "25 ", "200", "500", "800",
|
"---", "25 ", "200", "500", "800",
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VTX_COMMON
|
#ifdef USE_VTX_COMMON
|
||||||
static const vtxVTable_t saVTable; // Forward
|
static const vtxVTable_t saVTable; // Forward
|
||||||
static vtxDevice_t vtxSmartAudio = {
|
static vtxDevice_t vtxSmartAudio = {
|
||||||
.vTable = &saVTable,
|
.vTable = &saVTable,
|
||||||
|
@ -349,7 +349,7 @@ static void saProcessResponse(uint8_t *buf, int len)
|
||||||
}
|
}
|
||||||
saDevicePrev = saDevice;
|
saDevicePrev = saDevice;
|
||||||
|
|
||||||
#ifdef VTX_COMMON
|
#ifdef USE_VTX_COMMON
|
||||||
// Todo: Update states in saVtxDevice?
|
// Todo: Update states in saVtxDevice?
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -680,7 +680,7 @@ bool vtxSmartAudioInit(void)
|
||||||
serialPortConfig_t *portConfig = findSerialPortConfig(FUNCTION_VTX_SMARTAUDIO);
|
serialPortConfig_t *portConfig = findSerialPortConfig(FUNCTION_VTX_SMARTAUDIO);
|
||||||
if (portConfig) {
|
if (portConfig) {
|
||||||
portOptions_e portOptions = SERIAL_STOPBITS_2;
|
portOptions_e portOptions = SERIAL_STOPBITS_2;
|
||||||
#if defined(VTX_COMMON)
|
#if defined(USE_VTX_COMMON)
|
||||||
portOptions = portOptions | (vtxConfig()->halfDuplex ? SERIAL_BIDIR | SERIAL_BIDIR_PP : SERIAL_UNIDIR);
|
portOptions = portOptions | (vtxConfig()->halfDuplex ? SERIAL_BIDIR | SERIAL_BIDIR_PP : SERIAL_UNIDIR);
|
||||||
#else
|
#else
|
||||||
portOptions = SERIAL_BIDIR;
|
portOptions = SERIAL_BIDIR;
|
||||||
|
@ -774,7 +774,7 @@ void vtxSAProcess(timeUs_t currentTimeUs)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef VTX_COMMON
|
#ifdef USE_VTX_COMMON
|
||||||
// Interface to common VTX API
|
// Interface to common VTX API
|
||||||
|
|
||||||
vtxDevType_e vtxSAGetDeviceType(void)
|
vtxDevType_e vtxSAGetDeviceType(void)
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
#include "build/debug.h"
|
#include "build/debug.h"
|
||||||
|
|
||||||
#if defined(VTX_COMMON)
|
#if defined(USE_VTX_COMMON)
|
||||||
|
|
||||||
#define VTX_STRING_BAND_COUNT 5
|
#define VTX_STRING_BAND_COUNT 5
|
||||||
#define VTX_STRING_CHAN_COUNT 8
|
#define VTX_STRING_CHAN_COUNT 8
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
|
|
||||||
#if defined(VTX_TRAMP) && defined(VTX_CONTROL)
|
#if defined(USE_VTX_TRAMP) && defined(USE_VTX_CONTROL)
|
||||||
|
|
||||||
#include "build/debug.h"
|
#include "build/debug.h"
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
#include "io/vtx.h"
|
#include "io/vtx.h"
|
||||||
#include "io/vtx_string.h"
|
#include "io/vtx_string.h"
|
||||||
|
|
||||||
#if defined(USE_CMS) || defined(VTX_COMMON)
|
#if defined(USE_CMS) || defined(USE_VTX_COMMON)
|
||||||
const uint16_t trampPowerTable[VTX_TRAMP_POWER_COUNT] = {
|
const uint16_t trampPowerTable[VTX_TRAMP_POWER_COUNT] = {
|
||||||
25, 100, 200, 400, 600
|
25, 100, 200, 400, 600
|
||||||
};
|
};
|
||||||
|
@ -51,7 +51,7 @@ const char * const trampPowerNames[VTX_TRAMP_POWER_COUNT+1] = {
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(VTX_COMMON)
|
#if defined(USE_VTX_COMMON)
|
||||||
static const vtxVTable_t trampVTable; // forward
|
static const vtxVTable_t trampVTable; // forward
|
||||||
static vtxDevice_t vtxTramp = {
|
static vtxDevice_t vtxTramp = {
|
||||||
.vTable = &trampVTable,
|
.vTable = &trampVTable,
|
||||||
|
@ -485,7 +485,7 @@ void vtxTrampProcess(timeUs_t currentTimeUs)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef VTX_COMMON
|
#ifdef USE_VTX_COMMON
|
||||||
|
|
||||||
// Interface to common VTX API
|
// Interface to common VTX API
|
||||||
|
|
||||||
|
@ -597,7 +597,7 @@ bool vtxTrampInit(void)
|
||||||
|
|
||||||
if (portConfig) {
|
if (portConfig) {
|
||||||
portOptions_e portOptions = 0;
|
portOptions_e portOptions = 0;
|
||||||
#if defined(VTX_COMMON)
|
#if defined(USE_VTX_COMMON)
|
||||||
portOptions = portOptions | (vtxConfig()->halfDuplex ? SERIAL_BIDIR : SERIAL_UNIDIR);
|
portOptions = portOptions | (vtxConfig()->halfDuplex ? SERIAL_BIDIR : SERIAL_UNIDIR);
|
||||||
#else
|
#else
|
||||||
portOptions = SERIAL_BIDIR;
|
portOptions = SERIAL_BIDIR;
|
||||||
|
@ -610,7 +610,7 @@ bool vtxTrampInit(void)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(VTX_COMMON)
|
#if defined(USE_VTX_COMMON)
|
||||||
vtxCommonRegisterDevice(&vtxTramp);
|
vtxCommonRegisterDevice(&vtxTramp);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -120,7 +120,7 @@ static uint8_t spektrumFrameStatus(rxRuntimeConfig_t *rxRuntimeConfig)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(USE_SPEKTRUM_VTX_CONTROL) && defined(VTX_COMMON)
|
#if defined(USE_SPEKTRUM_VTX_CONTROL) && defined(USE_VTX_COMMON)
|
||||||
|
|
||||||
// Get the VTX control bytes in a frame
|
// Get the VTX control bytes in a frame
|
||||||
uint32_t vtxControl = ((spekFrame[SPEKTRUM_VTX_CONTROL_1] << 24) |
|
uint32_t vtxControl = ((spekFrame[SPEKTRUM_VTX_CONTROL_1] << 24) |
|
||||||
|
|
|
@ -107,7 +107,7 @@ typedef enum {
|
||||||
#ifdef USE_CMS
|
#ifdef USE_CMS
|
||||||
TASK_CMS,
|
TASK_CMS,
|
||||||
#endif
|
#endif
|
||||||
#ifdef VTX_CONTROL
|
#ifdef USE_VTX_CONTROL
|
||||||
TASK_VTXCTRL,
|
TASK_VTXCTRL,
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_CAMERA_CONTROL
|
#ifdef USE_CAMERA_CONTROL
|
||||||
|
|
|
@ -198,10 +198,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* OSD currently dependent upon CMS, SMARTAUDIO, TRAMP
|
/* OSD currently dependent upon CMS, SMARTAUDIO, TRAMP
|
||||||
#undef VTX_COMMON
|
#undef USE_VTX_COMMON
|
||||||
#undef VTX_CONTROL
|
#undef USE_VTX_CONTROL
|
||||||
#undef VTX_SMARTAUDIO
|
#undef USE_VTX_SMARTAUDIO
|
||||||
#undef VTX_TRAMP
|
#undef USE_VTX_TRAMP
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* OLED Support
|
/* OLED Support
|
||||||
|
|
|
@ -81,9 +81,9 @@
|
||||||
#define MAX7456_SPI_INSTANCE SPI1
|
#define MAX7456_SPI_INSTANCE SPI1
|
||||||
#define MAX7456_SPI_CS_PIN PA4
|
#define MAX7456_SPI_CS_PIN PA4
|
||||||
|
|
||||||
#define VTX_RTC6705
|
#define USE_VTX_RTC6705
|
||||||
#define VTX_RTC6705SOFTSPI
|
#define USE_VTX_RTC6705_SOFTSPI
|
||||||
#define VTX_CONTROL
|
#define USE_VTX_CONTROL
|
||||||
#define RTC6705_SPIDATA_PIN PC15
|
#define RTC6705_SPIDATA_PIN PC15
|
||||||
#define RTC6705_SPILE_PIN PB12
|
#define RTC6705_SPILE_PIN PB12
|
||||||
#define RTC6705_SPICLK_PIN PC13
|
#define RTC6705_SPICLK_PIN PC13
|
||||||
|
|
|
@ -116,8 +116,8 @@
|
||||||
#define SDCARD_DMA_CHANNEL DMA_Channel_0
|
#define SDCARD_DMA_CHANNEL DMA_Channel_0
|
||||||
|
|
||||||
// *************** RTC6705 *************************
|
// *************** RTC6705 *************************
|
||||||
#define VTX_RTC6705
|
#define USE_VTX_RTC6705
|
||||||
#define VTX_RTC6705SOFTSPI
|
#define USE_VTX_RTC6705_SOFTSPI
|
||||||
#define RTC6705_SPILE_PIN PB3
|
#define RTC6705_SPILE_PIN PB3
|
||||||
#define RTC6705_SPICLK_PIN PB4
|
#define RTC6705_SPICLK_PIN PB4
|
||||||
#define RTC6705_SPIDATA_PIN PB5
|
#define RTC6705_SPIDATA_PIN PB5
|
||||||
|
|
|
@ -97,8 +97,8 @@
|
||||||
#define SERIAL_PORT_COUNT 6 //VCP, USART1, USART2, UART4, UART5, USART6
|
#define SERIAL_PORT_COUNT 6 //VCP, USART1, USART2, UART4, UART5, USART6
|
||||||
#else
|
#else
|
||||||
#define SERIAL_PORT_COUNT 5 //VCP, USART1, USART2, UART4, UART5
|
#define SERIAL_PORT_COUNT 5 //VCP, USART1, USART2, UART4, UART5
|
||||||
#define VTX_RTC6705
|
#define USE_VTX_RTC6705
|
||||||
#define VTX_RTC6705SOFTSPI
|
#define USE_VTX_RTC6705_SOFTSPI
|
||||||
#define RTC6705_SPIDATA_PIN PC6
|
#define RTC6705_SPIDATA_PIN PC6
|
||||||
#define RTC6705_SPILE_PIN PC7
|
#define RTC6705_SPILE_PIN PC7
|
||||||
#define RTC6705_SPICLK_PIN PC2
|
#define RTC6705_SPICLK_PIN PC2
|
||||||
|
|
|
@ -72,7 +72,7 @@
|
||||||
#define USE_SPI_DEVICE_1 // PA4, 5, 6, 7
|
#define USE_SPI_DEVICE_1 // PA4, 5, 6, 7
|
||||||
#define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
|
#define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
|
||||||
|
|
||||||
#define VTX_RTC6705
|
#define USE_VTX_RTC6705
|
||||||
|
|
||||||
#define RTC6705_CS_PIN PA4
|
#define RTC6705_CS_PIN PA4
|
||||||
#define RTC6705_SPI_INSTANCE SPI1
|
#define RTC6705_SPI_INSTANCE SPI1
|
||||||
|
|
|
@ -108,8 +108,8 @@
|
||||||
#define MAX7456_DMA_CHANNEL_RX DMA2_Channel1
|
#define MAX7456_DMA_CHANNEL_RX DMA2_Channel1
|
||||||
#define MAX7456_DMA_IRQ_HANDLER_ID DMA2_CH1_HANDLER
|
#define MAX7456_DMA_IRQ_HANDLER_ID DMA2_CH1_HANDLER
|
||||||
|
|
||||||
#define VTX_RTC6705
|
#define USE_VTX_RTC6705
|
||||||
#define VTX_RTC6705SOFTSPI
|
#define USE_VTX_RTC6705_SOFTSPI
|
||||||
|
|
||||||
#define RTC6705_SPIDATA_PIN PC15
|
#define RTC6705_SPIDATA_PIN PC15
|
||||||
#define RTC6705_SPILE_PIN PC14
|
#define RTC6705_SPILE_PIN PC14
|
||||||
|
|
|
@ -115,10 +115,10 @@
|
||||||
#undef USE_TELEMETRY_JETIEXBUS
|
#undef USE_TELEMETRY_JETIEXBUS
|
||||||
#undef USE_TELEMETRY_SRXL
|
#undef USE_TELEMETRY_SRXL
|
||||||
#undef USE_SERIALRX_JETIEXBUS
|
#undef USE_SERIALRX_JETIEXBUS
|
||||||
#undef VTX_COMMON
|
#undef USE_VTX_COMMON
|
||||||
#undef VTX_CONTROL
|
#undef USE_VTX_CONTROL
|
||||||
#undef VTX_SMARTAUDIO
|
#undef USE_VTX_SMARTAUDIO
|
||||||
#undef VTX_TRAMP
|
#undef USE_VTX_TRAMP
|
||||||
#undef USE_CAMERA_CONTROL
|
#undef USE_CAMERA_CONTROL
|
||||||
|
|
||||||
#undef USE_I2C
|
#undef USE_I2C
|
||||||
|
|
|
@ -92,12 +92,12 @@
|
||||||
#define SPI3_MISO_PIN PB4
|
#define SPI3_MISO_PIN PB4
|
||||||
#define SPI3_MOSI_PIN PB5
|
#define SPI3_MOSI_PIN PB5
|
||||||
|
|
||||||
#define VTX_RTC6705
|
#define USE_VTX_RTC6705
|
||||||
#define VTX_RTC6705_OPTIONAL // VTX/OSD board is OPTIONAL
|
#define VTX_RTC6705_OPTIONAL // VTX/OSD board is OPTIONAL
|
||||||
|
|
||||||
// Disabled due to flash size
|
// Disabled due to flash size
|
||||||
#undef VTX_SMARTAUDIO
|
#undef USE_VTX_SMARTAUDIO
|
||||||
#undef VTX_TRAMP
|
#undef USE_VTX_TRAMP
|
||||||
|
|
||||||
#define RTC6705_CS_PIN PF4
|
#define RTC6705_CS_PIN PF4
|
||||||
#define RTC6705_SPI_INSTANCE SPI3
|
#define RTC6705_SPI_INSTANCE SPI3
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
#define SPI3_MISO_PIN PB4 // NC
|
#define SPI3_MISO_PIN PB4 // NC
|
||||||
#define SPI3_MOSI_PIN PB5 // NC
|
#define SPI3_MOSI_PIN PB5 // NC
|
||||||
|
|
||||||
#define VTX_RTC6705
|
#define USE_VTX_RTC6705
|
||||||
#define VTX_RTC6705_OPTIONAL // SPI3 on an F4 EVO may be used for RTC6705 VTX control.
|
#define VTX_RTC6705_OPTIONAL // SPI3 on an F4 EVO may be used for RTC6705 VTX control.
|
||||||
|
|
||||||
#define RTC6705_CS_PIN SPI3_NSS_PIN
|
#define RTC6705_CS_PIN SPI3_NSS_PIN
|
||||||
|
|
|
@ -133,7 +133,7 @@
|
||||||
#define SPI3_MOSI_PIN PB5
|
#define SPI3_MOSI_PIN PB5
|
||||||
|
|
||||||
// Bus Switched Device, Device B.
|
// Bus Switched Device, Device B.
|
||||||
#define VTX_RTC6705
|
#define USE_VTX_RTC6705
|
||||||
#define VTX_RTC6705_OPTIONAL // VTX/OSD board is OPTIONAL
|
#define VTX_RTC6705_OPTIONAL // VTX/OSD board is OPTIONAL
|
||||||
|
|
||||||
#define RTC6705_CS_PIN PC4
|
#define RTC6705_CS_PIN PC4
|
||||||
|
@ -214,8 +214,8 @@
|
||||||
//#define BINDPLUG_PIN BUTTON_A_PIN
|
//#define BINDPLUG_PIN BUTTON_A_PIN
|
||||||
|
|
||||||
// Temporarily disable SMARTAUDIO and TRAMP VTX support due to flash size issues.
|
// Temporarily disable SMARTAUDIO and TRAMP VTX support due to flash size issues.
|
||||||
#undef VTX_SMARTAUDIO
|
#undef USE_VTX_SMARTAUDIO
|
||||||
#undef VTX_TRAMP
|
#undef USE_VTX_TRAMP
|
||||||
|
|
||||||
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
|
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
|
||||||
|
|
||||||
|
|
|
@ -22,9 +22,9 @@
|
||||||
#include "build/version.h"
|
#include "build/version.h"
|
||||||
|
|
||||||
// Targets with built-in vtx do not need external vtx
|
// Targets with built-in vtx do not need external vtx
|
||||||
#if defined(VTX_RTC6705) && !defined(VTX_RTC6705_OPTIONAL)
|
#if defined(USE_VTX_RTC6705) && !defined(VTX_RTC6705_OPTIONAL)
|
||||||
#undef VTX_SMARTAUDIO
|
#undef USE_VTX_SMARTAUDIO
|
||||||
#undef VTX_TRAMP
|
#undef USE_VTX_TRAMP
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(USE_QUAD_MIXER_ONLY) && defined(USE_SERVOS)
|
#if defined(USE_QUAD_MIXER_ONLY) && defined(USE_SERVOS)
|
||||||
|
@ -69,11 +69,11 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* If either VTX_CONTROL or VTX_COMMON is undefined then remove common code and device drivers */
|
/* If either VTX_CONTROL or VTX_COMMON is undefined then remove common code and device drivers */
|
||||||
#if !defined(VTX_COMMON) || !defined(VTX_CONTROL)
|
#if !defined(USE_VTX_COMMON) || !defined(USE_VTX_CONTROL)
|
||||||
#undef VTX_COMMON
|
#undef USE_VTX_COMMON
|
||||||
#undef VTX_CONTROL
|
#undef USE_VTX_CONTROL
|
||||||
#undef VTX_TRAMP
|
#undef USE_VTX_TRAMP
|
||||||
#undef VTX_SMARTAUDIO
|
#undef USE_VTX_SMARTAUDIO
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(USE_RX_FRSKY_SPI_D) || defined(USE_RX_FRSKY_SPI_X)
|
#if defined(USE_RX_FRSKY_SPI_D) || defined(USE_RX_FRSKY_SPI_X)
|
||||||
|
|
|
@ -138,10 +138,10 @@
|
||||||
#define USE_SENSOR_NAMES
|
#define USE_SENSOR_NAMES
|
||||||
#define USE_SERIALRX_FPORT // FrSky FPort
|
#define USE_SERIALRX_FPORT // FrSky FPort
|
||||||
#define USE_VIRTUAL_CURRENT_METER
|
#define USE_VIRTUAL_CURRENT_METER
|
||||||
#define VTX_COMMON
|
#define USE_VTX_COMMON
|
||||||
#define VTX_CONTROL
|
#define USE_VTX_CONTROL
|
||||||
#define VTX_SMARTAUDIO
|
#define USE_VTX_SMARTAUDIO
|
||||||
#define VTX_TRAMP
|
#define USE_VTX_TRAMP
|
||||||
#define USE_CAMERA_CONTROL
|
#define USE_CAMERA_CONTROL
|
||||||
#define USE_GYRO_OVERFLOW_CHECK
|
#define USE_GYRO_OVERFLOW_CHECK
|
||||||
#define USE_HUFFMAN
|
#define USE_HUFFMAN
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue