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

Merge pull request #4455 from codecae/vtx_settings_pg_rework

Browse source 
Move vtxSettingsConfig to vtx_common.  Rework MSP_SET_VTX_CONFIG and CMS.
This commit is contained in:
Michael Keller 2017-11-10 08:14:36 +13:00 • committed by GitHub
commit 39727ce384
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 418 additions and 547 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,6 +63,7 @@
#include "io/transponder_ir.h"
#include "io/vtx_tramp.h" // Will be gone
#include "io/rcdevice_cam.h"
#include "io/vtx.h"
#include "msp/msp_serial.h"
@ -209,13 +210,13 @@ static void taskTelemetry(timeUs_t currentTimeUs)
#ifdef VTX_CONTROL
// Everything that listens to VTX devices
void taskVtxControl(uint32_t currentTime)
void taskVtxControl(timeUs_t currentTime)
{
if (ARMING_FLAG(ARMED))
if (ARMING_FLAG(ARMED) || cliMode)
return;
#ifdef VTX_COMMON
vtxCommonProcess(currentTime);
vtxProcess(currentTime);
#endif
}
#endif