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

Merge pull request #4521 from martinbudden/bf_cms_onglobalexit

Browse source 
Remove almost entirely unused CMS ononGlobalExit function
This commit is contained in:
Michael Keller 2017-11-10 10:35:13 +13:00 • committed by GitHub
commit 364afcbf25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 3 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/cms/cms.c
View file

@ -605,9 +605,6 @@ static void cmsTraverseGlobalExit(const CMS_Menu *pMenu)
} }
} }
if (pMenu->onGlobalExit) {
pMenu->onGlobalExit();
}
} }
long cmsMenuExit(displayPort_t *pDisplay, const void *ptr) long cmsMenuExit(displayPort_t *pDisplay, const void *ptr)

6
src/main/cms/cms_menu_blackbox.c
View file

@ -186,11 +186,6 @@ static long cmsx_Blackbox_onExit(const OSD_Entry *self)
return 0; return 0;
} }
static long cmsx_Blackbox_FeatureWriteback(void)
{
return 0;
}
static OSD_Entry cmsx_menuBlackboxEntries[] = static OSD_Entry cmsx_menuBlackboxEntries[] =
{ {
{ "-- BLACKBOX --", OME_Label, NULL, NULL, 0}, { "-- BLACKBOX --", OME_Label, NULL, NULL, 0},
@ -215,7 +210,6 @@ CMS_Menu cmsx_menuBlackbox = {
#endif #endif
.onEnter = cmsx_Blackbox_onEnter, .onEnter = cmsx_Blackbox_onEnter,
.onExit = cmsx_Blackbox_onExit, .onExit = cmsx_Blackbox_onExit,
.onGlobalExit = cmsx_Blackbox_FeatureWriteback,
.entries = cmsx_menuBlackboxEntries .entries = cmsx_menuBlackboxEntries
}; };

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

@ -87,7 +87,6 @@ static CMS_Menu menuInfo = {
#endif #endif
.onEnter = cmsx_InfoInit, .onEnter = cmsx_InfoInit,
.onExit = NULL, .onExit = NULL,
.onGlobalExit = NULL,
.entries = menuInfoEntries .entries = menuInfoEntries
}; };
@ -125,7 +124,6 @@ static CMS_Menu menuFeatures = {
#endif #endif
.onEnter = NULL, .onEnter = NULL,
.onExit = NULL, .onExit = NULL,
.onGlobalExit = NULL,
.entries = menuFeaturesEntries, .entries = menuFeaturesEntries,
}; };
@ -159,7 +157,6 @@ CMS_Menu menuMain = {
#endif #endif
.onEnter = NULL, .onEnter = NULL,
.onExit = NULL, .onExit = NULL,
.onGlobalExit = NULL,
.entries = menuMainEntries, .entries = menuMainEntries,
}; };
#endif #endif

7
src/main/cms/cms_menu_imu.c
View file

@ -167,7 +167,6 @@ static CMS_Menu cmsx_menuPid = {
#endif #endif
.onEnter = cmsx_PidOnEnter, .onEnter = cmsx_PidOnEnter,
.onExit = cmsx_PidWriteback, .onExit = cmsx_PidWriteback,
.onGlobalExit = NULL,
.entries = cmsx_menuPidEntries .entries = cmsx_menuPidEntries
}; };
@ -230,7 +229,6 @@ static CMS_Menu cmsx_menuRateProfile = {
#endif #endif
.onEnter = cmsx_RateProfileOnEnter, .onEnter = cmsx_RateProfileOnEnter,
.onExit = cmsx_RateProfileWriteback, .onExit = cmsx_RateProfileWriteback,
.onGlobalExit = NULL,
.entries = cmsx_menuRateProfileEntries .entries = cmsx_menuRateProfileEntries
}; };
@ -301,7 +299,6 @@ static CMS_Menu cmsx_menuProfileOther = {
#endif #endif
.onEnter = cmsx_profileOtherOnEnter, .onEnter = cmsx_profileOtherOnEnter,
.onExit = cmsx_profileOtherOnExit, .onExit = cmsx_profileOtherOnExit,
.onGlobalExit = NULL,
.entries = cmsx_menuProfileOtherEntries, .entries = cmsx_menuProfileOtherEntries,
}; };
@ -356,7 +353,6 @@ static CMS_Menu cmsx_menuFilterGlobal = {
#endif #endif
.onEnter = cmsx_menuGyro_onEnter, .onEnter = cmsx_menuGyro_onEnter,
.onExit = cmsx_menuGyro_onExit, .onExit = cmsx_menuGyro_onExit,
.onGlobalExit = NULL,
.entries = cmsx_menuFilterGlobalEntries, .entries = cmsx_menuFilterGlobalEntries,
}; };
@ -409,7 +405,6 @@ static CMS_Menu cmsx_menuFilterPerProfile = {
#endif #endif
.onEnter = cmsx_FilterPerProfileRead, .onEnter = cmsx_FilterPerProfileRead,
.onExit = cmsx_FilterPerProfileWriteback, .onExit = cmsx_FilterPerProfileWriteback,
.onGlobalExit = NULL,
.entries = cmsx_menuFilterPerProfileEntries, .entries = cmsx_menuFilterPerProfileEntries,
}; };
@ -480,7 +475,6 @@ CMS_Menu cmsx_menuCopyProfile = {
#endif #endif
.onEnter = cmsx_menuCopyProfile_onEnter, .onEnter = cmsx_menuCopyProfile_onEnter,
.onExit = NULL, .onExit = NULL,
.onGlobalExit = NULL,
.entries = cmsx_menuCopyProfileEntries, .entries = cmsx_menuCopyProfileEntries,
}; };
@ -514,7 +508,6 @@ CMS_Menu cmsx_menuImu = {
#endif #endif
.onEnter = cmsx_menuImu_onEnter, .onEnter = cmsx_menuImu_onEnter,
.onExit = cmsx_menuImu_onExit, .onExit = cmsx_menuImu_onExit,
.onGlobalExit = NULL,
.entries = cmsx_menuImuEntries, .entries = cmsx_menuImuEntries,
}; };

6
src/main/cms/cms_menu_ledstrip.c
View file

@ -52,8 +52,9 @@ static long cmsx_Ledstrip_FeatureRead(void)
return 0; return 0;
} }
static long cmsx_Ledstrip_FeatureWriteback(void) static long cmsx_Ledstrip_FeatureWriteback(const OSD_Entry *self)
{ {
UNUSED(self);
if (featureRead) { if (featureRead) {
if (cmsx_FeatureLedstrip) if (cmsx_FeatureLedstrip)
featureSet(FEATURE_LED_STRIP); featureSet(FEATURE_LED_STRIP);
@ -79,8 +80,7 @@ CMS_Menu cmsx_menuLedstrip = {
.GUARD_type = OME_MENU, .GUARD_type = OME_MENU,
#endif #endif
.onEnter = cmsx_Ledstrip_FeatureRead, .onEnter = cmsx_Ledstrip_FeatureRead,
.onExit = NULL, .onExit = cmsx_Ledstrip_FeatureWriteback,
.onGlobalExit = cmsx_Ledstrip_FeatureWriteback,
.entries = cmsx_menuLedstripEntries .entries = cmsx_menuLedstripEntries
}; };
#endif // LED_STRIP #endif // LED_STRIP

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

@ -88,7 +88,6 @@ CMS_Menu cmsx_menuRcPreview = {
#endif #endif
.onEnter = NULL, .onEnter = NULL,
.onExit = cmsx_menuRcConfirmBack, .onExit = cmsx_menuRcConfirmBack,
.onGlobalExit = NULL,
.entries = cmsx_menuRcEntries .entries = cmsx_menuRcEntries
}; };
@ -144,7 +143,6 @@ CMS_Menu cmsx_menuMisc = {
#endif #endif
.onEnter = cmsx_menuMiscOnEnter, .onEnter = cmsx_menuMiscOnEnter,
.onExit = cmsx_menuMiscOnExit, .onExit = cmsx_menuMiscOnExit,
.onGlobalExit = NULL,
.entries = menuMiscEntries .entries = menuMiscEntries
}; };

4
src/main/cms/cms_menu_osd.c
View file

@ -109,7 +109,6 @@ CMS_Menu menuOsdActiveElems = {
#endif #endif
.onEnter = menuOsdActiveElemsOnEnter, .onEnter = menuOsdActiveElemsOnEnter,
.onExit = menuOsdActiveElemsOnExit, .onExit = menuOsdActiveElemsOnExit,
.onGlobalExit = NULL,
.entries = menuOsdActiveElemsEntries .entries = menuOsdActiveElemsEntries
}; };
@ -154,7 +153,6 @@ CMS_Menu menuAlarms = {
#endif #endif
.onEnter = menuAlarmsOnEnter, .onEnter = menuAlarmsOnEnter,
.onExit = menuAlarmsOnExit, .onExit = menuAlarmsOnExit,
.onGlobalExit = NULL,
.entries = menuAlarmsEntries, .entries = menuAlarmsEntries,
}; };
@ -207,7 +205,6 @@ CMS_Menu menuTimers = {
#endif #endif
.onEnter = menuTimersOnEnter, .onEnter = menuTimersOnEnter,
.onExit = menuTimersOnExit, .onExit = menuTimersOnExit,
.onGlobalExit = NULL,
.entries = menuTimersEntries, .entries = menuTimersEntries,
}; };
#endif /* DISABLE_EXTENDED_CMS_OSD_MENU */ #endif /* DISABLE_EXTENDED_CMS_OSD_MENU */
@ -266,7 +263,6 @@ CMS_Menu cmsx_menuOsd = {
#endif #endif
.onEnter = cmsx_menuOsdOnEnter, .onEnter = cmsx_menuOsdOnEnter,
.onExit = cmsx_menuOsdOnExit, .onExit = cmsx_menuOsdOnExit,
.onGlobalExit = NULL,
.entries = cmsx_menuOsdEntries .entries = cmsx_menuOsdEntries
}; };
#endif // CMS #endif // CMS

1
src/main/cms/cms_menu_vtx_rtc6705.c
View file

@ -105,7 +105,6 @@ CMS_Menu cmsx_menuVtxRTC6705 = {
#endif #endif
.onEnter = cmsx_Vtx_onEnter, .onEnter = cmsx_Vtx_onEnter,
.onExit= cmsx_Vtx_onExit, .onExit= cmsx_Vtx_onExit,
.onGlobalExit = NULL,
.entries = cmsx_menuVtxEntries .entries = cmsx_menuVtxEntries
}; };

6
src/main/cms/cms_menu_vtx_smartaudio.c
View file

@ -354,7 +354,6 @@ static CMS_Menu saCmsMenuStats = {
#endif #endif
.onEnter = NULL, .onEnter = NULL,
.onExit = NULL, .onExit = NULL,
.onGlobalExit = NULL,
.entries = saCmsMenuStatsEntries .entries = saCmsMenuStatsEntries
}; };
@ -541,7 +540,6 @@ static CMS_Menu saCmsMenuPORFreq =
#endif #endif
.onEnter = saCmsSetPORFreqOnEnter, .onEnter = saCmsSetPORFreqOnEnter,
.onExit = NULL, .onExit = NULL,
.onGlobalExit = NULL,
.entries = saCmsMenuPORFreqEntries, .entries = saCmsMenuPORFreqEntries,
}; };
@ -564,7 +562,6 @@ static CMS_Menu saCmsMenuUserFreq =
#endif #endif
.onEnter = saCmsSetUserFreqOnEnter, .onEnter = saCmsSetUserFreqOnEnter,
.onExit = NULL, .onExit = NULL,
.onGlobalExit = NULL,
.entries = saCmsMenuUserFreqEntries, .entries = saCmsMenuUserFreqEntries,
}; };
@ -590,7 +587,6 @@ static CMS_Menu saCmsMenuConfig = {
#endif #endif
.onEnter = NULL, .onEnter = NULL,
.onExit = NULL, .onExit = NULL,
.onGlobalExit = NULL,
.entries = saCmsMenuConfigEntries .entries = saCmsMenuConfigEntries
}; };
@ -610,7 +606,6 @@ static CMS_Menu saCmsMenuCommence = {
#endif #endif
.onEnter = NULL, .onEnter = NULL,
.onExit = NULL, .onExit = NULL,
.onGlobalExit = NULL,
.entries = saCmsMenuCommenceEntries, .entries = saCmsMenuCommenceEntries,
}; };
@ -677,7 +672,6 @@ CMS_Menu cmsx_menuVtxSmartAudio = {
#endif #endif
.onEnter = sacms_SetupTopMenu, .onEnter = sacms_SetupTopMenu,
.onExit = NULL, .onExit = NULL,
.onGlobalExit = NULL,
.entries = saCmsMenuOfflineEntries, .entries = saCmsMenuOfflineEntries,
}; };

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

@ -205,7 +205,6 @@ static CMS_Menu trampCmsMenuCommence = {
#endif #endif
.onEnter = NULL, .onEnter = NULL,
.onExit = NULL, .onExit = NULL,
.onGlobalExit = NULL,
.entries = trampCmsMenuCommenceEntries, .entries = trampCmsMenuCommenceEntries,
}; };
@ -233,7 +232,6 @@ CMS_Menu cmsx_menuVtxTramp = {
#endif #endif
.onEnter = trampCmsOnEnter, .onEnter = trampCmsOnEnter,
.onExit = NULL, .onExit = NULL,
.onGlobalExit = NULL,
.entries = trampMenuEntries, .entries = trampMenuEntries,
}; };
#endif #endif

1
src/main/cms/cms_types.h
View file

@ -101,7 +101,6 @@ typedef struct
#endif #endif
const CMSMenuFuncPtr onEnter; const CMSMenuFuncPtr onEnter;
const CMSMenuOnExitPtr onExit; const CMSMenuOnExitPtr onExit;
const CMSMenuFuncPtr onGlobalExit;
OSD_Entry *entries; OSD_Entry *entries;
} CMS_Menu; } CMS_Menu;

1
src/test/unit/cms_unittest.cc
View file

@ -129,7 +129,6 @@ CMS_Menu menuMain = {
"MENUMAIN", "MENUMAIN",
OME_MENU, OME_MENU,
#endif #endif
NULL,
NULL, NULL,
NULL, NULL,
menuMainEntries, menuMainEntries,