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

VTX menu: onEntry and onExit should be working now

Browse source 
Don’t know why this was overlooked.
Needs testing.
This commit is contained in:
jflyper 2016-11-07 17:12:57 +09:00
parent 3bce0fb5f1
commit 3c2849ffdc
2 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/cms/cms_menu_builtin.c
View file

@ -112,7 +112,7 @@ static CMS_Menu menuFeatures = {
static OSD_Entry menuMainEntries[] = static OSD_Entry menuMainEntries[] =
{ {
{"--- MAIN MENU ---", OME_Label, NULL, NULL, 0}, {"-- MAIN MENU --", OME_Label, NULL, NULL, 0},
{"CFG&IMU", OME_Submenu, cmsMenuChange, &cmsx_menuImu, 0}, {"CFG&IMU", OME_Submenu, cmsMenuChange, &cmsx_menuImu, 0},
{"FEATURES", OME_Submenu, cmsMenuChange, &menuFeatures, 0}, {"FEATURES", OME_Submenu, cmsMenuChange, &menuFeatures, 0},
#ifdef OSD #ifdef OSD

31
src/main/cms/cms_menu_vtx.c
View file

@ -38,20 +38,24 @@
static bool featureRead = false; static bool featureRead = false;
static uint8_t cmsx_featureVtx = 0, cmsx_vtxBand, cmsx_vtxChannel; static uint8_t cmsx_featureVtx = 0, cmsx_vtxBand, cmsx_vtxChannel;
static void cmsx_Vtx_FeatureRead(void) static long cmsx_Vtx_FeatureRead(void)
{ {
if (!featureRead) { if (!featureRead) {
cmsx_featureVtx = feature(FEATURE_VTX) ? 1 : 0; cmsx_featureVtx = feature(FEATURE_VTX) ? 1 : 0;
featureRead = true; featureRead = true;
} }
return 0;
} }
static void cmsx_Vtx_FeatureWriteback(void) static long cmsx_Vtx_FeatureWriteback(void)
{ {
if (cmsx_featureVtx) if (cmsx_featureVtx)
featureSet(FEATURE_VTX); featureSet(FEATURE_VTX);
else else
featureClear(FEATURE_VTX); featureClear(FEATURE_VTX);
return 0;
} }
static const char * const vtxBandNames[] = { static const char * const vtxBandNames[] = {
@ -90,6 +94,23 @@ static void cmsx_Vtx_ConfigWriteback(void)
#endif // USE_RTC6705 #endif // USE_RTC6705
} }
static long cmsx_Vtx_onEnter(void)
{
cmsx_Vtx_FeatureRead();
cmsx_Vtx_ConfigRead();
return 0;
}
static long cmsx_Vtx_onExit(OSD_Entry *self)
{
UNUSED(self);
cmsx_Vtx_ConfigWriteback();
return 0;
}
#ifdef VTX #ifdef VTX
static OSD_UINT8_t entryVtxMode = {&masterConfig.vtx_mode, 0, 2, 1}; static OSD_UINT8_t entryVtxMode = {&masterConfig.vtx_mode, 0, 2, 1};
static OSD_UINT16_t entryVtxMhz = {&masterConfig.vtx_mhz, 5600, 5950, 1}; static OSD_UINT16_t entryVtxMhz = {&masterConfig.vtx_mhz, 5600, 5950, 1};
@ -115,9 +136,9 @@ static OSD_Entry cmsx_menuVtxEntries[] =
CMS_Menu cmsx_menuVtx = { CMS_Menu cmsx_menuVtx = {
"MENUVTX", "MENUVTX",
OME_MENU, OME_MENU,
NULL, cmsx_Vtx_onEnter,
NULL, cmsx_Vtx_onExit,
NULL, cmsx_Vtx_FeatureWriteback,
cmsx_menuVtxEntries, cmsx_menuVtxEntries,
}; };