mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-16 12:55:19 +03:00
Remove almost entirely unused CMS ononGlobalExit function
This commit is contained in:
parent
9a5cefbfa3
commit
9a9884e4af
12 changed files with 3 additions and 39 deletions
|
@ -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)
|
||||||
|
|
|
@ -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},
|
||||||
|
@ -213,7 +208,6 @@ CMS_Menu cmsx_menuBlackbox = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.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
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,6 @@ static CMS_Menu menuInfo = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = cmsx_InfoInit,
|
.onEnter = cmsx_InfoInit,
|
||||||
.onExit = NULL,
|
.onExit = NULL,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = menuInfoEntries
|
.entries = menuInfoEntries
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -121,7 +120,6 @@ static CMS_Menu menuFeatures = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = NULL,
|
.onEnter = NULL,
|
||||||
.onExit = NULL,
|
.onExit = NULL,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = menuFeaturesEntries,
|
.entries = menuFeaturesEntries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -153,7 +151,6 @@ CMS_Menu menuMain = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = NULL,
|
.onEnter = NULL,
|
||||||
.onExit = NULL,
|
.onExit = NULL,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = menuMainEntries,
|
.entries = menuMainEntries,
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -165,7 +165,6 @@ static CMS_Menu cmsx_menuPid = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = cmsx_PidOnEnter,
|
.onEnter = cmsx_PidOnEnter,
|
||||||
.onExit = cmsx_PidWriteback,
|
.onExit = cmsx_PidWriteback,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = cmsx_menuPidEntries
|
.entries = cmsx_menuPidEntries
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -226,7 +225,6 @@ static CMS_Menu cmsx_menuRateProfile = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = cmsx_RateProfileOnEnter,
|
.onEnter = cmsx_RateProfileOnEnter,
|
||||||
.onExit = cmsx_RateProfileWriteback,
|
.onExit = cmsx_RateProfileWriteback,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = cmsx_menuRateProfileEntries
|
.entries = cmsx_menuRateProfileEntries
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -295,7 +293,6 @@ static CMS_Menu cmsx_menuProfileOther = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = cmsx_profileOtherOnEnter,
|
.onEnter = cmsx_profileOtherOnEnter,
|
||||||
.onExit = cmsx_profileOtherOnExit,
|
.onExit = cmsx_profileOtherOnExit,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = cmsx_menuProfileOtherEntries,
|
.entries = cmsx_menuProfileOtherEntries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -348,7 +345,6 @@ static CMS_Menu cmsx_menuFilterGlobal = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = cmsx_menuGyro_onEnter,
|
.onEnter = cmsx_menuGyro_onEnter,
|
||||||
.onExit = cmsx_menuGyro_onExit,
|
.onExit = cmsx_menuGyro_onExit,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = cmsx_menuFilterGlobalEntries,
|
.entries = cmsx_menuFilterGlobalEntries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -399,7 +395,6 @@ static CMS_Menu cmsx_menuFilterPerProfile = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = cmsx_FilterPerProfileRead,
|
.onEnter = cmsx_FilterPerProfileRead,
|
||||||
.onExit = cmsx_FilterPerProfileWriteback,
|
.onExit = cmsx_FilterPerProfileWriteback,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = cmsx_menuFilterPerProfileEntries,
|
.entries = cmsx_menuFilterPerProfileEntries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -468,7 +463,6 @@ CMS_Menu cmsx_menuCopyProfile = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = cmsx_menuCopyProfile_onEnter,
|
.onEnter = cmsx_menuCopyProfile_onEnter,
|
||||||
.onExit = NULL,
|
.onExit = NULL,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = cmsx_menuCopyProfileEntries,
|
.entries = cmsx_menuCopyProfileEntries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -500,7 +494,6 @@ CMS_Menu cmsx_menuImu = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = cmsx_menuImu_onEnter,
|
.onEnter = cmsx_menuImu_onEnter,
|
||||||
.onExit = cmsx_menuImu_onExit,
|
.onExit = cmsx_menuImu_onExit,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = cmsx_menuImuEntries,
|
.entries = cmsx_menuImuEntries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
|
@ -77,8 +78,7 @@ CMS_Menu cmsx_menuLedstrip = {
|
||||||
.GUARD_text = "MENULED",
|
.GUARD_text = "MENULED",
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.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
|
||||||
|
|
|
@ -86,7 +86,6 @@ CMS_Menu cmsx_menuRcPreview = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = NULL,
|
.onEnter = NULL,
|
||||||
.onExit = cmsx_menuRcConfirmBack,
|
.onExit = cmsx_menuRcConfirmBack,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = cmsx_menuRcEntries
|
.entries = cmsx_menuRcEntries
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -140,7 +139,6 @@ CMS_Menu cmsx_menuMisc = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = cmsx_menuMiscOnEnter,
|
.onEnter = cmsx_menuMiscOnEnter,
|
||||||
.onExit = cmsx_menuMiscOnExit,
|
.onExit = cmsx_menuMiscOnExit,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = menuMiscEntries
|
.entries = menuMiscEntries
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -107,7 +107,6 @@ CMS_Menu menuOsdActiveElems = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = menuOsdActiveElemsOnEnter,
|
.onEnter = menuOsdActiveElemsOnEnter,
|
||||||
.onExit = menuOsdActiveElemsOnExit,
|
.onExit = menuOsdActiveElemsOnExit,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = menuOsdActiveElemsEntries
|
.entries = menuOsdActiveElemsEntries
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -150,7 +149,6 @@ CMS_Menu menuAlarms = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = menuAlarmsOnEnter,
|
.onEnter = menuAlarmsOnEnter,
|
||||||
.onExit = menuAlarmsOnExit,
|
.onExit = menuAlarmsOnExit,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = menuAlarmsEntries,
|
.entries = menuAlarmsEntries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -201,7 +199,6 @@ CMS_Menu menuTimers = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.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 */
|
||||||
|
@ -258,7 +255,6 @@ CMS_Menu cmsx_menuOsd = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = cmsx_menuOsdOnEnter,
|
.onEnter = cmsx_menuOsdOnEnter,
|
||||||
.onExit = cmsx_menuOsdOnExit,
|
.onExit = cmsx_menuOsdOnExit,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = cmsx_menuOsdEntries
|
.entries = cmsx_menuOsdEntries
|
||||||
};
|
};
|
||||||
#endif // CMS
|
#endif // CMS
|
||||||
|
|
|
@ -95,7 +95,6 @@ CMS_Menu cmsx_menuVtxRTC6705 = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = cmsx_Vtx_onEnter,
|
.onEnter = cmsx_Vtx_onEnter,
|
||||||
.onExit= cmsx_Vtx_onExit,
|
.onExit= cmsx_Vtx_onExit,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = cmsx_menuVtxEntries
|
.entries = cmsx_menuVtxEntries
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -352,7 +352,6 @@ static CMS_Menu saCmsMenuStats = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = NULL,
|
.onEnter = NULL,
|
||||||
.onExit = NULL,
|
.onExit = NULL,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = saCmsMenuStatsEntries
|
.entries = saCmsMenuStatsEntries
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -518,7 +517,6 @@ static CMS_Menu saCmsMenuPORFreq =
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = saCmsSetPORFreqOnEnter,
|
.onEnter = saCmsSetPORFreqOnEnter,
|
||||||
.onExit = NULL,
|
.onExit = NULL,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = saCmsMenuPORFreqEntries,
|
.entries = saCmsMenuPORFreqEntries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -539,7 +537,6 @@ static CMS_Menu saCmsMenuUserFreq =
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = saCmsSetUserFreqOnEnter,
|
.onEnter = saCmsSetUserFreqOnEnter,
|
||||||
.onExit = NULL,
|
.onExit = NULL,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = saCmsMenuUserFreqEntries,
|
.entries = saCmsMenuUserFreqEntries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -563,7 +560,6 @@ static CMS_Menu saCmsMenuConfig = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = NULL,
|
.onEnter = NULL,
|
||||||
.onExit = NULL,
|
.onExit = NULL,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = saCmsMenuConfigEntries
|
.entries = saCmsMenuConfigEntries
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -581,7 +577,6 @@ static CMS_Menu saCmsMenuCommence = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = NULL,
|
.onEnter = NULL,
|
||||||
.onExit = NULL,
|
.onExit = NULL,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = saCmsMenuCommenceEntries,
|
.entries = saCmsMenuCommenceEntries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -646,7 +641,6 @@ CMS_Menu cmsx_menuVtxSmartAudio = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = sacms_SetupTopMenu,
|
.onEnter = sacms_SetupTopMenu,
|
||||||
.onExit = NULL,
|
.onExit = NULL,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = saCmsMenuOfflineEntries,
|
.entries = saCmsMenuOfflineEntries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -195,7 +195,6 @@ static CMS_Menu trampCmsMenuCommence = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = NULL,
|
.onEnter = NULL,
|
||||||
.onExit = NULL,
|
.onExit = NULL,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = trampCmsMenuCommenceEntries,
|
.entries = trampCmsMenuCommenceEntries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -221,7 +220,6 @@ CMS_Menu cmsx_menuVtxTramp = {
|
||||||
.GUARD_type = OME_MENU,
|
.GUARD_type = OME_MENU,
|
||||||
.onEnter = trampCmsOnEnter,
|
.onEnter = trampCmsOnEnter,
|
||||||
.onExit = NULL,
|
.onExit = NULL,
|
||||||
.onGlobalExit = NULL,
|
|
||||||
.entries = trampMenuEntries,
|
.entries = trampMenuEntries,
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -100,7 +100,6 @@ typedef struct
|
||||||
|
|
||||||
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;
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,6 @@ CMS_Menu menuMain = {
|
||||||
OME_MENU,
|
OME_MENU,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
|
||||||
menuMainEntries,
|
menuMainEntries,
|
||||||
};
|
};
|
||||||
uint8_t armingFlags;
|
uint8_t armingFlags;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue