Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 17:55:30 +03:00
Code Issues Wiki Activity

Merge pull request #4916 from mikeller/convert_vtx_defines_to_use_use

Browse source 
Converted defines for `VTX_COMMON`, `VTX_CONTROL`, `VTX_RTC6705`, `VTX_RTC6705SOFTSPI`, `VTX_TRAMP`, `VTX_SMARTAUDIO` to use `USE_` prefix.
This commit is contained in:
Michael Keller 2018-01-10 01:04:39 +13:00 • committed by GitHub
commit 2157bd67e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 101 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/interface/cli.c
View file

@ -1858,7 +1858,7 @@ static void cliFlashRead(char *cmdline)
#endif
#endif
#ifdef VTX_CONTROL
#ifdef USE_VTX_CONTROL
static void printVtx(uint8_t dumpMask, const vtxConfig_t *vtxConfig, const vtxConfig_t *vtxConfigDefault)
{
// print out vtx channel settings
@ -3560,7 +3560,7 @@ static void printConfig(char *cmdline, bool doDiff)
cliPrintHashLine("rxrange");
printRxRange(dumpMask, rxChannelRangeConfigs_CopyArray, rxChannelRangeConfigs(0));
#ifdef VTX_CONTROL
#ifdef USE_VTX_CONTROL
cliPrintHashLine("vtx");
printVtx(dumpMask, &vtxConfig_Copy, vtxConfig());
#endif
@ -3734,7 +3734,7 @@ const clicmd_t cmdTable[] = {
CLI_COMMAND_DEF("tasks", "show task stats", NULL, cliTasks),
#endif
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),
#endif
};

4
src/main/interface/msp.c
View file

@ -1206,7 +1206,7 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst)
sbufWriteU8(dst, compassConfig()->mag_hardware);
break;
#if defined(VTX_COMMON)
#if defined(USE_VTX_COMMON)
case MSP_VTX_CONFIG:
{
uint8_t deviceType = vtxCommonGetDeviceType();
@ -1702,7 +1702,7 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
break;
#endif
#ifdef VTX_COMMON
#ifdef USE_VTX_COMMON
case MSP_SET_VTX_CONFIG:
{
if (vtxCommonDeviceRegistered()) {

2
src/main/interface/msp_box.c
View file

@ -256,7 +256,7 @@ void initActiveBoxIds(void)
BME(BOXCAMERA3);
#endif
#if defined(VTX_SMARTAUDIO) || defined(VTX_TRAMP)
#if defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_TRAMP)
BME(BOXVTXPITMODE);
#endif

4
src/main/interface/settings.c
View file

@ -793,7 +793,7 @@ const clivalue_t valueTable[] = {
{ "pwr_on_arm_grace", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, 30 }, PG_SYSTEM_CONFIG, offsetof(systemConfig_t, powerOnArmingGraceTime) },
// 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_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) },
@ -805,7 +805,7 @@ const clivalue_t valueTable[] = {
#endif
// 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) },
#endif