diff --git a/src/main/drivers/vtx_common.h b/src/main/drivers/vtx_common.h index 4897fe0ef..bdf38a15e 100644 --- a/src/main/drivers/vtx_common.h +++ b/src/main/drivers/vtx_common.h @@ -28,8 +28,8 @@ #include "common/time.h" #include "common/streambuf.h" -#define VTX_SETTINGS_MIN_FREQUENCY_MHZ 5000 //min freq (in MHz) for 'vtx_freq' setting -#define VTX_SETTINGS_MAX_FREQUENCY_MHZ 5999 //max freq (in MHz) for 'vtx_freq' setting +#define VTX_SETTINGS_MIN_FREQUENCY_MHZ 1 //min freq (in MHz) for 'vtx_freq' setting +#define VTX_SETTINGS_MAX_FREQUENCY_MHZ 7000 //max freq (in MHz) for 'vtx_freq' setting #if defined(USE_VTX_RTC6705) diff --git a/src/main/io/vtx.c b/src/main/io/vtx.c index 49acc0e39..bf0d2c347 100644 --- a/src/main/io/vtx.c +++ b/src/main/io/vtx.c @@ -140,7 +140,7 @@ STATIC_UNIT_TESTED vtxSettingsConfig_t vtxGetSettings(void) static bool vtxProcessBandAndChannel(vtxDevice_t *vtxDevice) { - if (!ARMING_FLAG(ARMED)) { + if (!ARMING_FLAG(ARMED) || 1) { uint8_t vtxBand; uint8_t vtxChan; if (vtxCommonGetBandAndChannel(vtxDevice, &vtxBand, &vtxChan)) { @@ -157,7 +157,7 @@ static bool vtxProcessBandAndChannel(vtxDevice_t *vtxDevice) #if defined(VTX_SETTINGS_FREQCMD) static bool vtxProcessFrequency(vtxDevice_t *vtxDevice) { - if (!ARMING_FLAG(ARMED)) { + if (!ARMING_FLAG(ARMED) || 1) { uint16_t vtxFreq; if (vtxCommonGetFrequency(vtxDevice, &vtxFreq)) { const vtxSettingsConfig_t settings = vtxGetSettings(); @@ -278,7 +278,7 @@ void vtxUpdate(timeUs_t currentTimeUs) currentSchedule = (currentSchedule + 1) % VTX_PARAM_COUNT; } while (!vtxUpdatePending && currentSchedule != startingSchedule); - if (!ARMING_FLAG(ARMED) || vtxUpdatePending) { + if (1 || vtxUpdatePending) { vtxCommonProcess(vtxDevice, currentTimeUs); } } diff --git a/src/main/io/vtx_control.c b/src/main/io/vtx_control.c index 8f7b74d1e..657b9e28e 100644 --- a/src/main/io/vtx_control.c +++ b/src/main/io/vtx_control.c @@ -74,9 +74,9 @@ void vtxControlInputPoll(void) static void vtxUpdateBandAndChannel(uint8_t bandStep, uint8_t channelStep) { - if (ARMING_FLAG(ARMED)) { - locked = 1; - } + // if (ARMING_FLAG(ARMED)) { + // locked = 1; + // } if (!locked && vtxCommonDevice()) { vtxSettingsConfigMutable()->band += bandStep; @@ -106,9 +106,9 @@ void vtxDecrementChannel(void) void vtxUpdateActivatedChannel(void) { - if (ARMING_FLAG(ARMED)) { - locked = 1; - } + // if (ARMING_FLAG(ARMED)) { + // locked = 1; + // } if (vtxCommonDevice()) { static uint8_t lastIndex = -1; diff --git a/src/main/io/vtx_smartaudio.h b/src/main/io/vtx_smartaudio.h index e04a9dbf6..6d84a238a 100644 --- a/src/main/io/vtx_smartaudio.h +++ b/src/main/io/vtx_smartaudio.h @@ -35,8 +35,8 @@ #define VTX_SMARTAUDIO_MIN_CHANNEL 1 -#define VTX_SMARTAUDIO_MIN_FREQUENCY_MHZ 5000 //min freq in MHz -#define VTX_SMARTAUDIO_MAX_FREQUENCY_MHZ 5999 //max freq in MHz +#define VTX_SMARTAUDIO_MIN_FREQUENCY_MHZ 1 //min freq in MHz +#define VTX_SMARTAUDIO_MAX_FREQUENCY_MHZ 7000 //max freq in MHz // opmode flags, GET side #define SA_MODE_GET_FREQ_BY_FREQ 1 diff --git a/src/main/io/vtx_tramp.h b/src/main/io/vtx_tramp.h index a56410490..33a8e0739 100644 --- a/src/main/io/vtx_tramp.h +++ b/src/main/io/vtx_tramp.h @@ -24,8 +24,8 @@ #define VTX_TRAMP_POWER_COUNT 5 -#define VTX_TRAMP_MIN_FREQUENCY_MHZ 5000 //min freq in MHz -#define VTX_TRAMP_MAX_FREQUENCY_MHZ 5999 //max freq in MHz +#define VTX_TRAMP_MIN_FREQUENCY_MHZ 1 //min freq in MHz +#define VTX_TRAMP_MAX_FREQUENCY_MHZ 7000 //max freq in MHz bool vtxTrampInit(void);