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

Fixed frequency reference for band/chan mode to dynamically update

Browse source
This commit is contained in:
jflyper 2016-11-30 12:57:14 +09:00
parent aad3fc58cf
commit 336f871405
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main/io/vtx_smartaudio.c
View file

@ -723,6 +723,10 @@ uint8_t saCmsRFState; // RF state; ACTIVE, PIR, POR XXX Not currently
uint8_t saCmsBand = 0; uint8_t saCmsBand = 0;
uint8_t saCmsChan = 0; uint8_t saCmsChan = 0;
uint8_t saCmsPower = 0; uint8_t saCmsPower = 0;
// Frequency derived from channel table (used for reference in band/chan mode)
uint16_t saCmsFreqRef = 0;
uint16_t saCmsDeviceFreq = 0; uint16_t saCmsDeviceFreq = 0;
uint8_t saCmsDeviceStatus = 0; uint8_t saCmsDeviceStatus = 0;
@ -746,6 +750,8 @@ void saCmsUpdate(void)
saCmsBand = (saDevice.chan / 8) + 1; saCmsBand = (saDevice.chan / 8) + 1;
saCmsChan = (saDevice.chan % 8) + 1; saCmsChan = (saDevice.chan % 8) + 1;
saCmsFreqRef = saFreqTable[saDevice.chan / 8][saDevice.chan % 8];
saCmsDeviceFreq = saFreqTable[saDevice.chan / 8][saDevice.chan % 8]; saCmsDeviceFreq = saFreqTable[saDevice.chan / 8][saDevice.chan % 8];
if ((saDevice.mode & SA_MODE_GET_PITMODE) == 0) { if ((saDevice.mode & SA_MODE_GET_PITMODE) == 0) {
@ -839,14 +845,14 @@ dprintf(("saCmsConfigBand: band req %d ", saCmsBand));
if (saCmsBand == 0) { if (saCmsBand == 0) {
// Bouce back, no going back to undef state // Bouce back, no going back to undef state
saCmsBand = 1; saCmsBand = 1;
dprintf(("--> %d\r\n", saCmsBand));
return 0; return 0;
} }
dprintf(("--> %d\r\n", saCmsBand));
if (!(saCmsOpmodel == SACMS_OPMODEL_FREE && saDeferred)) if (!(saCmsOpmodel == SACMS_OPMODEL_FREE && saDeferred))
saSetBandChan(saCmsBand - 1, saCmsChan - 1); saSetBandChan(saCmsBand - 1, saCmsChan - 1);
saCmsFreqRef = saFreqTable[saCmsBand - 1][saCmsChan - 1];
return 0; return 0;
} }
@ -870,6 +876,8 @@ static long saCmsConfigChanByGvar(displayPort_t *pDisp, const void *self)
if (!(saCmsOpmodel == SACMS_OPMODEL_FREE && saDeferred)) if (!(saCmsOpmodel == SACMS_OPMODEL_FREE && saDeferred))
saSetBandChan(saCmsBand - 1, saCmsChan - 1); saSetBandChan(saCmsBand - 1, saCmsChan - 1);
saCmsFreqRef = saFreqTable[saCmsBand - 1][saCmsChan - 1];
return 0; return 0;
} }
@ -994,8 +1002,11 @@ static const char * const saCmsPowerNames[] = {
static OSD_TAB_t saCmsEntPower = { &saCmsPower, 4, saCmsPowerNames}; static OSD_TAB_t saCmsEntPower = { &saCmsPower, 4, saCmsPowerNames};
// Frequency the vtx is currently transmitting at
static OSD_UINT16_t saCmsEntFreq = { &saCmsDeviceFreq, 5600, 5900, 0 }; static OSD_UINT16_t saCmsEntFreq = { &saCmsDeviceFreq, 5600, 5900, 0 };
static OSD_UINT16_t saCmsEntFreqRef = { &saCmsFreqRef, 5600, 5900, 0 };
static const char * const saCmsOpmodelNames[] = { static const char * const saCmsOpmodelNames[] = {
"----", "----",
"FREE", "FREE",
@ -1051,7 +1062,7 @@ static long saCmsCommence(displayPort_t *pDisp, const void *self)
saSetFreq(saCmsUserFreq); saSetFreq(saCmsUserFreq);
} }
return 0; return MENU_CHAIN_BACK;
} }
static long saCmsSetPORFreqOnEnter(void) static long saCmsSetPORFreqOnEnter(void)
@ -1210,7 +1221,7 @@ static OSD_Entry saCmsMenuChanModeEntries[] =
{ "", OME_Label, NULL, saCmsStatusString, DYNAMIC }, { "", OME_Label, NULL, saCmsStatusString, DYNAMIC },
{ "BAND", OME_TAB, saCmsConfigBandByGvar, &saCmsEntBand, 0 }, { "BAND", OME_TAB, saCmsConfigBandByGvar, &saCmsEntBand, 0 },
{ "CHAN", OME_TAB, saCmsConfigChanByGvar, &saCmsEntChan, 0 }, { "CHAN", OME_TAB, saCmsConfigChanByGvar, &saCmsEntChan, 0 },
{ "(FREQ)", OME_UINT16, NULL, &saCmsEntFreq, DYNAMIC }, { "(FREQ)", OME_UINT16, NULL, &saCmsEntFreqRef, DYNAMIC },
{ "POWER", OME_TAB, saCmsConfigPowerByGvar, &saCmsEntPower, 0 }, { "POWER", OME_TAB, saCmsConfigPowerByGvar, &saCmsEntPower, 0 },
{ "SET", OME_Submenu, cmsMenuChange, &saCmsMenuCommence, 0 }, { "SET", OME_Submenu, cmsMenuChange, &saCmsMenuCommence, 0 },
{ "CONFIG", OME_Submenu, cmsMenuChange, &saCmsMenuConfig, 0 }, { "CONFIG", OME_Submenu, cmsMenuChange, &saCmsMenuConfig, 0 },