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

VTX Pit Mode control conflict resolved, Tx switch vs menues, (#5621)

Browse source
This commit is contained in:
Anders Höglund 2018-04-04 16:03:12 +02:00 • committed by Michael Keller
parent a3a4f5586f
commit 21e77dd66d
2 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/io/spektrum_vtx_control.c
View file

@ -150,10 +150,17 @@ void spektrumHandleVtxControl(uint32_t vtxCntrl)
// ############ VTX_CONTROL task #############
void spektrumVtxControl(void)
{
static uint32_t prevVtxControl =0;
uint32_t vtxControl;
// Check for invalid VTX ctrl frames
if ((vtxControl_ipc & SPEKTRUM_VTX_CONTROL_FRAME_MASK) != SPEKTRUM_VTX_CONTROL_FRAME) return;
uint32_t vtxControl = vtxControl_ipc;
vtxControl = vtxControl_ipc;
vtxControl_ipc = 0;
if (prevVtxControl == vtxControl) return;
prevVtxControl = vtxControl;
spektrumVtx_t vtx = {
.pitMode = (vtxControl & SPEKTRUM_VTX_PIT_MODE_MASK) >> SPEKTRUM_VTX_PIT_MODE_SHIFT,
@ -201,9 +208,10 @@ void spektrumVtxControl(void)
}
// Everyone seems to agree on what PIT ON/OFF means
uint8_t currentPitMode = 0;
vtxCommonGetPitMode(vtxDevice, &currentPitMode);
if (currentPitMode != vtx.pitMode) {
vtxCommonSetPitMode(vtxDevice, vtx.pitMode);
if (vtxCommonGetPitMode(vtxDevice, &currentPitMode)) {
if (currentPitMode != vtx.pitMode) {
vtxCommonSetPitMode(vtxDevice, vtx.pitMode);
}
}
}