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

fixed pre-processor directives (continued)

Browse source
This commit is contained in:
Raphael Coeffic 2017-01-15 23:18:38 +01:00
parent 99cff4a875
commit af72b761b5
4 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/cms/cms_menu_builtin.c
View file

@ -97,12 +97,14 @@ static OSD_Entry menuFeaturesEntries[] =
#if defined(VTX) || defined(USE_RTC6705) #if defined(VTX) || defined(USE_RTC6705)
{"VTX", OME_Submenu, cmsMenuChange, &cmsx_menuVtx, 0}, {"VTX", OME_Submenu, cmsMenuChange, &cmsx_menuVtx, 0},
#endif // VTX || USE_RTC6705 #endif // VTX || USE_RTC6705
#if defined(VTX_CONTROL)
#if defined(VTX_SMARTAUDIO) #if defined(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(VTX_TRAMP)
{"VTX TR", OME_Submenu, cmsMenuChange, &cmsx_menuVtxTramp, 0}, {"VTX TR", OME_Submenu, cmsMenuChange, &cmsx_menuVtxTramp, 0},
#endif #endif
#endif // VTX_CONTROL
#ifdef LED_STRIP #ifdef LED_STRIP
{"LED STRIP", OME_Submenu, cmsMenuChange, &cmsx_menuLedstrip, 0}, {"LED STRIP", OME_Submenu, cmsMenuChange, &cmsx_menuLedstrip, 0},
#endif // LED_STRIP #endif // LED_STRIP

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

@ -524,6 +524,8 @@ void init(void)
baroSetCalibrationCycles(CALIBRATING_BARO_CYCLES); baroSetCalibrationCycles(CALIBRATING_BARO_CYCLES);
#endif #endif
#ifdef VTX_CONTROL
#ifdef VTX_SMARTAUDIO #ifdef VTX_SMARTAUDIO
smartAudioInit(); smartAudioInit();
#endif #endif
@ -532,6 +534,8 @@ void init(void)
trampInit(); trampInit();
#endif #endif
#endif // VTX_CONTROL
// start all timers // start all timers
// TODO - not implemented yet // TODO - not implemented yet
timerStart(); timerStart();

4
src/main/io/vtx_tramp.h
View file

@ -1,5 +1,7 @@
#pragma once #pragma once
#if defined(VTX_TRAMP) && defined(VTX_CONTROL)
bool trampInit(); bool trampInit();
void trampProcess(uint32_t currentTimeUs); void trampProcess(uint32_t currentTimeUs);
@ -8,3 +10,5 @@ void trampProcess(uint32_t currentTimeUs);
#include "cms/cms_types.h" #include "cms/cms_types.h"
extern CMS_Menu cmsx_menuVtxTramp; extern CMS_Menu cmsx_menuVtxTramp;
#endif #endif
#endif

1
src/main/target/common_post.h
View file

@ -22,5 +22,4 @@
// Targets with built-in vtx do not need external vtx // Targets with built-in vtx do not need external vtx
#if defined(VTX) || defined(USE_RTC6705) #if defined(VTX) || defined(USE_RTC6705)
# undef VTX_CONTROL # undef VTX_CONTROL
# undef VTX_SMARTAUDIO
#endif #endif