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

Fix building without USE_VTX_*

Browse source
This commit is contained in:
Michel Pastor 2018-07-25 16:57:59 +02:00
parent 9d73b0862e
commit 972f74bf60
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/fc/fc_init.c
View file

@ -652,7 +652,7 @@ void init(void)
pitotStartCalibration(); pitotStartCalibration();
#endif #endif
#ifdef USE_VTX_CONTROL #if defined(USE_VTX_COMMON) && defined(USE_VTX_CONTROL)
vtxControlInit(); vtxControlInit();
#if defined(USE_VTX_COMMON) #if defined(USE_VTX_COMMON)
@ -668,7 +668,7 @@ void init(void)
vtxTrampInit(); vtxTrampInit();
#endif #endif
#endif // USE_VTX_CONTROL #endif // USE_VTX_COMMON && USE_VTX_CONTROL
// Now that everything has powered up the voltage and cell count be determined. // Now that everything has powered up the voltage and cell count be determined.
if (feature(FEATURE_VBAT | FEATURE_CURRENT_METER)) if (feature(FEATURE_VBAT | FEATURE_CURRENT_METER))

2
src/main/fc/fc_tasks.c
View file

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

1
src/main/fc/settings.yaml
View file

@ -1664,6 +1664,7 @@ groups:
- name: PG_VTX_SETTINGS_CONFIG - name: PG_VTX_SETTINGS_CONFIG
type: vtxSettingsConfig_t type: vtxSettingsConfig_t
headers: ["drivers/vtx_common.h", "io/vtx.h"] headers: ["drivers/vtx_common.h", "io/vtx.h"]
condition: defined(VTX_COMMON) || (defined(USE_CMS) && defined(USE_VTX_SMARTAUDIO))
members: members:
- name: vtx_band - name: vtx_band
field: band field: band