mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-18 22:05:17 +03:00
Merge pull request #4185 from jflyper/bfdev-fix-rtc6705-optional-for-f4evo
F3EVO,F4EVO,F4NEO: Liberation from RTC6705 locked VTX feature.
This commit is contained in:
commit
1370dbd070
3 changed files with 7 additions and 1 deletions
|
@ -42,6 +42,11 @@ void vtxCommonRegisterDevice(vtxDevice_t *pDevice)
|
|||
vtxDevice = pDevice;
|
||||
}
|
||||
|
||||
bool vtxCommonDeviceRegistered(void)
|
||||
{
|
||||
return vtxDevice;
|
||||
}
|
||||
|
||||
void vtxCommonProcess(uint32_t currentTimeUs)
|
||||
{
|
||||
if (!vtxDevice)
|
||||
|
|
|
@ -78,6 +78,7 @@ typedef struct vtxVTable_s {
|
|||
|
||||
void vtxCommonInit(void);
|
||||
void vtxCommonRegisterDevice(vtxDevice_t *pDevice);
|
||||
bool vtxCommonDeviceRegistered(void);
|
||||
|
||||
// VTable functions
|
||||
void vtxCommonProcess(uint32_t currentTimeUs);
|
||||
|
|
|
@ -677,7 +677,7 @@ void init(void)
|
|||
#endif
|
||||
|
||||
#ifdef VTX_RTC6705
|
||||
#ifdef VTX_RTC6705OPTIONAL
|
||||
#ifdef VTX_RTC6705_OPTIONAL
|
||||
if (!vtxCommonDeviceRegistered()) // external VTX takes precedence when configured.
|
||||
#endif
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue