Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-25 09:16:01 +03:00
Code Issues Wiki Activity

Combine BACK and END entries in CMS menus in a single item

Browse source 
As suggested by @hydra. OME_Back and OME_END continue to be valid
items, but we now also have OME_BACK_AND_END which creates a back
entry and indicates the end of the menu, saving an entry. On F3,
this saves 464 bytes of flash.
This commit is contained in:
Alberto García Hierro 2019-02-16 22:10:25 +00:00
parent 826e339988
commit 3ba770c1e2
14 changed files with 69 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/cms/cms_menu_navigation.c
View file

@ -52,8 +52,7 @@ static const OSD_Entry cmsx_menuNavSettingsEntries[] =
OSD_SETTING_ENTRY("MID THR FOR AH", SETTING_NAV_USE_MIDTHR_FOR_ALTHOLD),
OSD_SETTING_ENTRY("MC HOVER THR", SETTING_NAV_MC_HOVER_THR),
OSD_BACK_ENTRY,
OSD_END_ENTRY,
OSD_BACK_AND_END_ENTRY,
};
static const CMS_Menu cmsx_menuNavSettings = {
@ -83,8 +82,7 @@ static const CMS_Menu cmsx_menuNavSettings = {
OSD_SETTING_ENTRY("RTH ABORT THRES", SETTING_NAV_RTH_ABORT_THRESHOLD),
OSD_SETTING_ENTRY("EMERG LANDING SPEED", SETTING_NAV_EMERG_LANDING_SPEED),
OSD_BACK_ENTRY,
OSD_END_ENTRY,
OSD_BACK_AND_END_ENTRY,
};
static const CMS_Menu cmsx_menuRTH = {
@ -111,8 +109,7 @@ static const OSD_Entry cmsx_menuFixedWingEntries[] =
OSD_SETTING_ENTRY("PITCH TO THR RATIO", SETTING_NAV_FW_PITCH2THR),
OSD_SETTING_ENTRY("LOITER RADIUS", SETTING_NAV_FW_LOITER_RADIUS),
OSD_BACK_ENTRY,
OSD_END_ENTRY,
OSD_BACK_AND_END_ENTRY,
};
static const CMS_Menu cmsx_menuFixedWing = {
@ -134,8 +131,7 @@ static const OSD_Entry cmsx_menuNavigationEntries[] =
OSD_SUBMENU_ENTRY("RTH", &cmsx_menuRTH),
OSD_SUBMENU_ENTRY("FIXED WING", &cmsx_menuFixedWing),
OSD_BACK_ENTRY,
OSD_END_ENTRY,
OSD_BACK_AND_END_ENTRY,
};
const CMS_Menu cmsx_menuNavigation = {