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

Use macros for the BACK and END items in CMS menus

Browse source 
Will make future changes cleaner
This commit is contained in:
Alberto García Hierro 2018-03-05 19:48:54 +00:00
parent ae05b1c993
commit 741b6c3242
12 changed files with 81 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,8 +49,9 @@ static OSD_Entry cmsx_menuNavSettingsEntries[] =
OSD_SETTING_ENTRY("MC MAX BANK ANGLE", SETTING_NAV_MC_BANK_ANGLE),
OSD_SETTING_ENTRY("MID THR FOR AH", SETTING_NAV_USE_MIDTHR_FOR_ALTHOLD),
OSD_SETTING_ENTRY("MC HOVER THR", SETTING_NAV_MC_HOVER_THR),
{ "BACK", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 }
OSD_BACK_ENTRY,
OSD_END_ENTRY,
};
static CMS_Menu cmsx_menuNavSettings = {
@ -78,8 +79,9 @@ static CMS_Menu cmsx_menuNavSettings = {
OSD_SETTING_ENTRY("MIN RTH DISTANCE", SETTING_NAV_MIN_RTH_DISTANCE),
OSD_SETTING_ENTRY("RTH ABORT THRES", SETTING_NAV_RTH_ABORT_THRESHOLD),
OSD_SETTING_ENTRY("EMERG LANDING SPEED", SETTING_NAV_EMERG_LANDING_SPEED),
{ "BACK", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 }
OSD_BACK_ENTRY,
OSD_END_ENTRY,
};
static CMS_Menu cmsx_menuRTH = {
@ -104,8 +106,9 @@ static OSD_Entry cmsx_menuFixedWingEntries[] =
OSD_SETTING_ENTRY("MAX DIVE ANGLE", SETTING_NAV_FW_DIVE_ANGLE),
OSD_SETTING_ENTRY("PITCH TO THR RATIO", SETTING_NAV_FW_PITCH2THR),
OSD_SETTING_ENTRY("LOITER RADIUS", SETTING_NAV_FW_LOITER_RADIUS),
{ "BACK", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 }
OSD_BACK_ENTRY,
OSD_END_ENTRY,
};
static CMS_Menu cmsx_menuFixedWing = {
@ -125,8 +128,9 @@ static OSD_Entry cmsx_menuNavigationEntries[] =
{ "BASIC SETTINGS", OME_Submenu, cmsMenuChange, &cmsx_menuNavSettings, 0},
{ "RTH", OME_Submenu, cmsMenuChange, &cmsx_menuRTH, 0},
{ "FIXED WING", OME_Submenu, cmsMenuChange, &cmsx_menuFixedWing, 0},
{ "BACK", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 }
OSD_BACK_ENTRY,
OSD_END_ENTRY,
};
CMS_Menu cmsx_menuNavigation = {