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

Removed 'checkRedirect' and references to it.

Browse source
This commit is contained in:
Michael Keller 2019-11-26 15:30:39 +13:00 • committed by mikeller
parent 95791fc293
commit 140bb22b88
18 changed files with 0 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -669,13 +669,6 @@ long cmsMenuChange(displayPort_t *pDisplay, const void *ptr)
return 0;
}
if (pMenu->checkRedirect) {
const CMS_Menu *pRedirectMenu = (const CMS_Menu *)pMenu->checkRedirect();
if (pRedirectMenu) {
return cmsMenuChange(pDisplay, pRedirectMenu);
}
}
menuStack[menuStackIdx++] = currentCtx;
currentCtx.menu = pMenu;

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

@ -221,7 +221,6 @@ CMS_Menu cmsx_menuBlackbox = {
#endif
.onEnter = cmsx_Blackbox_onEnter,
.onExit = cmsx_Blackbox_onExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuBlackboxEntries
};

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

@ -91,7 +91,6 @@ CMS_Menu cmsx_menuFailsafe = {
#endif
.onEnter = cmsx_Failsafe_onEnter,
.onExit = cmsx_Failsafe_onExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuFailsafeEntries
};

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

@ -140,7 +140,6 @@ static CMS_Menu cmsx_menuCalibration = {
#endif
.onEnter = NULL,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = cmsx_CalibrationOnDisplayUpdate,
.entries = menuCalibrationEntries
};
@ -185,7 +184,6 @@ CMS_Menu cmsx_menuFirmware = {
#endif
.onEnter = cmsx_FirmwareInit,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = menuFirmwareEntries
};

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

@ -117,7 +117,6 @@ CMS_Menu cms_menuGpsRescuePid = {
#endif
.onEnter = cms_menuGpsRescuePidOnEnter,
.onExit = cms_menuGpsRescuePidOnExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cms_menuGpsRescuePidEntries,
};
@ -200,7 +199,6 @@ CMS_Menu cmsx_menuGpsRescue = {
#endif
.onEnter = cmsx_menuGpsRescueOnEnter,
.onExit = cmsx_menuGpsRescueOnExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuGpsRescueEntries,
};

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

@ -223,7 +223,6 @@ static CMS_Menu cmsx_menuPid = {
#endif
.onEnter = cmsx_PidOnEnter,
.onExit = cmsx_PidWriteback,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuPidEntries
};
@ -291,7 +290,6 @@ static CMS_Menu cmsx_menuRateProfile = {
#endif
.onEnter = cmsx_RateProfileOnEnter,
.onExit = cmsx_RateProfileWriteback,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuRateProfileEntries
};
@ -351,7 +349,6 @@ static CMS_Menu cmsx_menuLaunchControl = {
#endif
.onEnter = cmsx_launchControlOnEnter,
.onExit = cmsx_launchControlOnExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuLaunchControlEntries,
};
@ -498,7 +495,6 @@ static CMS_Menu cmsx_menuProfileOther = {
#endif
.onEnter = cmsx_profileOtherOnEnter,
.onExit = cmsx_profileOtherOnExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuProfileOtherEntries,
};
@ -567,7 +563,6 @@ static CMS_Menu cmsx_menuFilterGlobal = {
#endif
.onEnter = cmsx_menuGyro_onEnter,
.onExit = cmsx_menuGyro_onExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuFilterGlobalEntries,
};
@ -656,7 +651,6 @@ static CMS_Menu cmsx_menuDynFilt = {
#endif
.onEnter = cmsx_menuDynFilt_onEnter,
.onExit = cmsx_menuDynFilt_onExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuDynFiltEntries,
};
@ -718,7 +712,6 @@ static CMS_Menu cmsx_menuFilterPerProfile = {
#endif
.onEnter = cmsx_FilterPerProfileRead,
.onExit = cmsx_FilterPerProfileWriteback,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuFilterPerProfileEntries,
};
@ -790,7 +783,6 @@ CMS_Menu cmsx_menuCopyProfile = {
#endif
.onEnter = cmsx_menuCopyProfile_onEnter,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuCopyProfileEntries,
};
@ -829,7 +821,6 @@ CMS_Menu cmsx_menuImu = {
#endif
.onEnter = cmsx_menuImu_onEnter,
.onExit = cmsx_menuImu_onExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuImuEntries,
};

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

@ -127,7 +127,6 @@ CMS_Menu cmsx_menuLedstrip = {
#endif
.onEnter = cmsx_Ledstrip_OnEnter,
.onExit = cmsx_Ledstrip_OnExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuLedstripEntries
};

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

@ -84,7 +84,6 @@ static CMS_Menu cmsx_menuFeatures = {
#endif
.onEnter = NULL,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = menuFeaturesEntries,
};
@ -125,7 +124,6 @@ CMS_Menu cmsx_menuMain = {
#endif
.onEnter = NULL,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = menuMainEntries,
};

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

@ -96,7 +96,6 @@ CMS_Menu cmsx_menuRcPreview = {
#endif
.onEnter = NULL,
.onExit = cmsx_menuRcConfirmBack,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuRcEntries
};
@ -149,7 +148,6 @@ CMS_Menu cmsx_menuMisc = {
#endif
.onEnter = cmsx_menuMiscOnEnter,
.onExit = cmsx_menuMiscOnExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = menuMiscEntries
};

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

@ -158,7 +158,6 @@ static CMS_Menu menuOsdActiveElems = {
#endif
.onEnter = menuOsdActiveElemsOnEnter,
.onExit = menuOsdActiveElemsOnExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = menuOsdActiveElemsEntries
};
@ -224,7 +223,6 @@ static CMS_Menu menuAlarms = {
#endif
.onEnter = menuAlarmsOnEnter,
.onExit = menuAlarmsOnExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = menuAlarmsEntries,
};
@ -278,7 +276,6 @@ static CMS_Menu menuTimers = {
#endif
.onEnter = menuTimersOnEnter,
.onExit = menuTimersOnExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = menuTimersEntries,
};
@ -353,7 +350,6 @@ CMS_Menu cmsx_menuOsd = {
#endif
.onEnter = cmsx_menuOsdOnEnter,
.onExit = cmsx_menuOsdOnExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuOsdEntries
};

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

@ -126,7 +126,6 @@ CMS_Menu cmsx_menuPower = {
#endif
.onEnter = cmsx_Power_onEnter,
.onExit = cmsx_Power_onExit,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuPowerEntries
};

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

@ -51,7 +51,6 @@ CMS_Menu cmsx_menuSaveExit = {
#endif
.onEnter = NULL,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuSaveExitEntries
};
@ -72,7 +71,6 @@ CMS_Menu cmsx_menuSaveExitReboot = {
#endif
.onEnter = NULL,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = cmsx_menuSaveExitRebootEntries
};

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

@ -80,7 +80,6 @@ static CMS_Menu cmsx_menuVtxError = {
#endif
.onEnter = setStatusMessage,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = vtxErrorMenuEntries,
};

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

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

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

@ -416,7 +416,6 @@ static CMS_Menu saCmsMenuStats = {
#endif
.onEnter = NULL,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = saCmsMenuStatsEntries
};
@ -615,7 +614,6 @@ static CMS_Menu saCmsMenuPORFreq =
#endif
.onEnter = saCmsSetPORFreqOnEnter,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = saCmsMenuPORFreqEntries,
};
@ -639,7 +637,6 @@ static CMS_Menu saCmsMenuUserFreq =
#endif
.onEnter = saCmsSetUserFreqOnEnter,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = saCmsMenuUserFreqEntries,
};
@ -668,7 +665,6 @@ static CMS_Menu saCmsMenuConfig = {
#endif
.onEnter = NULL,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = saCmsMenuConfigEntries
};
@ -689,7 +685,6 @@ static CMS_Menu saCmsMenuCommence = {
#endif
.onEnter = NULL,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = saCmsMenuCommenceEntries,
};
@ -763,7 +758,6 @@ CMS_Menu cmsx_menuVtxSmartAudio = {
#endif
.onEnter = sacms_SetupTopMenu,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = saCmsMenuOfflineEntries,
};

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

@ -243,7 +243,6 @@ static CMS_Menu trampCmsMenuCommence = {
#endif
.onEnter = NULL,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = trampCmsMenuCommenceEntries,
};
@ -272,7 +271,6 @@ CMS_Menu cmsx_menuVtxTramp = {
#endif
.onEnter = trampCmsOnEnter,
.onExit = NULL,
.checkRedirect = NULL,
.onDisplayUpdate = NULL,
.entries = trampMenuEntries,
};

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

@ -109,7 +109,6 @@ typedef struct
#endif
const CMSMenuFuncPtr onEnter;
const CMSMenuOnExitPtr onExit;
const CMSMenuCheckRedirectPtr checkRedirect;
const CMSMenuOnDisplayUpdatePtr onDisplayUpdate;
const OSD_Entry *entries;
} CMS_Menu;

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

@ -132,7 +132,6 @@ CMS_Menu cmsx_menuMain = {
#endif
.onEnter = NULL,
.onExit = NULL,
.checkRedirect = NULL,
.entries = menuMainEntries,
};
uint8_t armingFlags;