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

Fix VTX low power disarm when USE_VTX_RTC6705 is defined (#8936)

Browse source 
Fix VTX low power disarm when USE_VTX_RTC6705 is defined
This commit is contained in:
Michael Keller 2019-09-25 23:22:07 +12:00 • committed by GitHub
commit 81bca4b7b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/drivers/vtx_table.h
View file

@ -49,6 +49,8 @@
#define VTX_TABLE_DEFAULT_CHANNEL 1 #define VTX_TABLE_DEFAULT_CHANNEL 1
#define VTX_TABLE_DEFAULT_FREQ 5740 #define VTX_TABLE_DEFAULT_FREQ 5740
#define VTX_TABLE_DEFAULT_PITMODE_FREQ 0 #define VTX_TABLE_DEFAULT_PITMODE_FREQ 0
#define VTX_TABLE_LOW_POWER_INDEX 1
#ifdef USE_VTX_RTC6705 #ifdef USE_VTX_RTC6705
#define VTX_TABLE_DEFAULT_POWER VTX_RTC6705_DEFAULT_POWER_INDEX #define VTX_TABLE_DEFAULT_POWER VTX_RTC6705_DEFAULT_POWER_INDEX
#else #else

28
src/main/io/vtx.c
View file

@ -31,6 +31,9 @@
#include "common/time.h" #include "common/time.h"
#include "drivers/vtx_common.h" #include "drivers/vtx_common.h"
#if defined(USE_VTX_RTC6705)
#include "drivers/vtx_rtc6705.h"
#endif
#include "drivers/vtx_table.h" #include "drivers/vtx_table.h"
#include "fc/config.h" #include "fc/config.h"
@ -109,6 +112,27 @@ void vtxInit(void)
} }
} }
// Once refactoring for RTC6705 to handle pit mode properly and remove the requirement
// for having a 0 value in the vtxtable power levels is completed then this function will
// no longer be required and the VTX_TABLE_LOW_POWER_INDEX value can always be used.
static uint8_t vtxGetMinimumPowerIndex(void)
{
const vtxDevice_t *vtxDevice = vtxCommonDevice();
vtxDevType_e vtxType = VTXDEV_UNKNOWN;
if (vtxDevice) {
vtxType = vtxCommonGetDeviceType(vtxDevice);
}
switch (vtxType) {
#if defined(USE_VTX_RTC6705)
case VTXDEV_RTC6705:
// special handling for rtc6705 which has the low power setting in index 2
return VTX_RTC6705_DEFAULT_POWER_INDEX;
#endif
default:
return VTX_TABLE_LOW_POWER_INDEX;
}
}
STATIC_UNIT_TESTED vtxSettingsConfig_t vtxGetSettings(void) STATIC_UNIT_TESTED vtxSettingsConfig_t vtxGetSettings(void)
{ {
vtxSettingsConfig_t settings = { vtxSettingsConfig_t settings = {
@ -124,14 +148,14 @@ STATIC_UNIT_TESTED vtxSettingsConfig_t vtxGetSettings(void)
if (IS_RC_MODE_ACTIVE(BOXVTXPITMODE) && settings.pitModeFreq) { if (IS_RC_MODE_ACTIVE(BOXVTXPITMODE) && settings.pitModeFreq) {
settings.band = 0; settings.band = 0;
settings.freq = settings.pitModeFreq; settings.freq = settings.pitModeFreq;
settings.power = VTX_TABLE_DEFAULT_POWER; settings.power = vtxGetMinimumPowerIndex();
} }
#endif #endif
if (!ARMING_FLAG(ARMED) && !failsafeIsActive() && if (!ARMING_FLAG(ARMED) && !failsafeIsActive() &&
(settings.lowPowerDisarm == VTX_LOW_POWER_DISARM_ALWAYS || (settings.lowPowerDisarm == VTX_LOW_POWER_DISARM_ALWAYS ||
(settings.lowPowerDisarm == VTX_LOW_POWER_DISARM_UNTIL_FIRST_ARM && !ARMING_FLAG(WAS_EVER_ARMED)))) { (settings.lowPowerDisarm == VTX_LOW_POWER_DISARM_UNTIL_FIRST_ARM && !ARMING_FLAG(WAS_EVER_ARMED)))) {
settings.power = VTX_TABLE_DEFAULT_POWER; settings.power = vtxGetMinimumPowerIndex();
} }
return settings; return settings;