rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4521 from martinbudden/bf_cms_onglobalexit 

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
parent b90f7bd88e 9a9884e4af
commit 364afcbf25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 3 additions and 39 deletions
Show Stats 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)

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;
}
static long cmsx_Blackbox_FeatureWriteback(void)
{
return 0;
}
static OSD_Entry cmsx_menuBlackboxEntries[] =
{
{ "-- BLACKBOX --", OME_Label, NULL, NULL, 0},
@ -215,7 +210,6 @@ CMS_Menu cmsx_menuBlackbox = {
#endif
.onEnter = cmsx_Blackbox_onEnter,
.onExit = cmsx_Blackbox_onExit,
.onGlobalExit = cmsx_Blackbox_FeatureWriteback,
.entries = cmsx_menuBlackboxEntries
};

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

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

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

@ -167,7 +167,6 @@ static CMS_Menu cmsx_menuPid = {
#endif
.onEnter = cmsx_PidOnEnter,
.onExit = cmsx_PidWriteback,
.onGlobalExit = NULL,
.entries = cmsx_menuPidEntries
};
@ -230,7 +229,6 @@ static CMS_Menu cmsx_menuRateProfile = {
#endif
.onEnter = cmsx_RateProfileOnEnter,
.onExit = cmsx_RateProfileWriteback,
.onGlobalExit = NULL,
.entries = cmsx_menuRateProfileEntries
};
@ -301,7 +299,6 @@ static CMS_Menu cmsx_menuProfileOther = {
#endif
.onEnter = cmsx_profileOtherOnEnter,
.onExit = cmsx_profileOtherOnExit,
.onGlobalExit = NULL,
.entries = cmsx_menuProfileOtherEntries,
};
@ -356,7 +353,6 @@ static CMS_Menu cmsx_menuFilterGlobal = {
#endif
.onEnter = cmsx_menuGyro_onEnter,
.onExit = cmsx_menuGyro_onExit,
.onGlobalExit = NULL,
.entries = cmsx_menuFilterGlobalEntries,
};
@ -409,7 +405,6 @@ static CMS_Menu cmsx_menuFilterPerProfile = {
#endif
.onEnter = cmsx_FilterPerProfileRead,
.onExit = cmsx_FilterPerProfileWriteback,
.onGlobalExit = NULL,
.entries = cmsx_menuFilterPerProfileEntries,
};
@ -480,7 +475,6 @@ CMS_Menu cmsx_menuCopyProfile = {
#endif
.onEnter = cmsx_menuCopyProfile_onEnter,
.onExit = NULL,
.onGlobalExit = NULL,
.entries = cmsx_menuCopyProfileEntries,
};
@ -514,7 +508,6 @@ CMS_Menu cmsx_menuImu = {
#endif
.onEnter = cmsx_menuImu_onEnter,
.onExit = cmsx_menuImu_onExit,
.onGlobalExit = NULL,
.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;
}
static long cmsx_Ledstrip_FeatureWriteback(void)
static long cmsx_Ledstrip_FeatureWriteback(const OSD_Entry *self)
{
UNUSED(self);
if (featureRead) {
if (cmsx_FeatureLedstrip)
featureSet(FEATURE_LED_STRIP);
@ -79,8 +80,7 @@ CMS_Menu cmsx_menuLedstrip = {
.GUARD_type = OME_MENU,
#endif
.onEnter = cmsx_Ledstrip_FeatureRead,
.onExit = NULL,
.onGlobalExit = cmsx_Ledstrip_FeatureWriteback,
.onExit = cmsx_Ledstrip_FeatureWriteback,
.entries = cmsx_menuLedstripEntries
};
#endif // LED_STRIP

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

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

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

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

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

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

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

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

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

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

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

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

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

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