Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-26 09:45:33 +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

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

@ -158,8 +158,9 @@ static char menuErrLabel[21 + 1] = "RANDOM DATA";
static OSD_Entry menuErrEntries[] = { static OSD_Entry menuErrEntries[] = {
{ "BROKEN MENU", OME_Label, NULL, NULL, 0 }, { "BROKEN MENU", OME_Label, NULL, NULL, 0 },
{ menuErrLabel, OME_Label, NULL, NULL, 0 }, { menuErrLabel, OME_Label, NULL, NULL, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 } OSD_BACK_ENTRY,
OSD_END_ENTRY,
}; };
static CMS_Menu menuErr = { static CMS_Menu menuErr = {

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

@ -84,8 +84,8 @@ static OSD_Entry cmsx_menuBlackboxEntries[] =
{ "ERASE FLASH",OME_Funcall, cmsx_EraseFlash, NULL, 0 }, { "ERASE FLASH",OME_Funcall, cmsx_EraseFlash, NULL, 0 },
#endif // USE_FLASHFS #endif // USE_FLASHFS
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
CMS_Menu cmsx_menuBlackbox = { CMS_Menu cmsx_menuBlackbox = {

8
src/main/cms/cms_menu_builtin.c
View file

@ -79,8 +79,8 @@ static OSD_Entry menuInfoEntries[] = {
{ "FWVER", OME_String, NULL, FC_VERSION_STRING, 0 }, { "FWVER", OME_String, NULL, FC_VERSION_STRING, 0 },
{ "GITREV", OME_String, NULL, infoGitRev, 0 }, { "GITREV", OME_String, NULL, infoGitRev, 0 },
{ "TARGET", OME_String, NULL, infoTargetName, 0 }, { "TARGET", OME_String, NULL, infoTargetName, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
static CMS_Menu menuInfo = { static CMS_Menu menuInfo = {
@ -117,8 +117,8 @@ static OSD_Entry menuFeaturesEntries[] =
#ifdef USE_LED_STRIP #ifdef USE_LED_STRIP
{"LED STRIP", OME_Submenu, cmsMenuChange, &cmsx_menuLedstrip, 0}, {"LED STRIP", OME_Submenu, cmsMenuChange, &cmsx_menuLedstrip, 0},
#endif // LED_STRIP #endif // LED_STRIP
{"BACK", OME_Back, NULL, NULL, 0}, OSD_BACK_ENTRY,
{NULL, OME_END, NULL, NULL, 0} OSD_END_ENTRY,
}; };
static CMS_Menu menuFeatures = { static CMS_Menu menuFeatures = {

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

@ -145,8 +145,8 @@ static OSD_Entry cmsx_menuPidEntries[] =
{ "YAW I", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_pidYaw[1], 0, 200, 1 }, 0 }, { "YAW I", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_pidYaw[1], 0, 200, 1 }, 0 },
{ "YAW D", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_pidYaw[2], 0, 200, 1 }, 0 }, { "YAW D", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_pidYaw[2], 0, 200, 1 }, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
static CMS_Menu cmsx_menuPid = { static CMS_Menu cmsx_menuPid = {
@ -197,8 +197,8 @@ static OSD_Entry cmsx_menuPidAltMagEntries[] = {
{ "VEL D", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_pidVelZ[2], 0, 255, 1 }, 0 }, { "VEL D", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_pidVelZ[2], 0, 255, 1 }, 0 },
{ "MAG P", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_pidHead[0], 0, 255, 1 }, 0 }, { "MAG P", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_pidHead[0], 0, 255, 1 }, 0 },
{"BACK", OME_Back, NULL, NULL, 0}, OSD_BACK_ENTRY,
{NULL, OME_END, NULL, NULL, 0} OSD_END_ENTRY,
}; };
static CMS_Menu cmsx_menuPidAltMag = { static CMS_Menu cmsx_menuPidAltMag = {
@ -244,8 +244,8 @@ static OSD_Entry cmsx_menuPidGpsnavEntries[] = {
{ "POSR I", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_pidVelXY[1], 0, 255, 1 }, 0 }, { "POSR I", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_pidVelXY[1], 0, 255, 1 }, 0 },
{ "POSR D", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_pidVelXY[2], 0, 255, 1 }, 0 }, { "POSR D", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_pidVelXY[2], 0, 255, 1 }, 0 },
{"BACK", OME_Back, NULL, NULL, 0}, OSD_BACK_ENTRY,
{NULL, OME_END, NULL, NULL, 0} OSD_END_ENTRY,
}; };
static CMS_Menu cmsx_menuPidGpsnav = { static CMS_Menu cmsx_menuPidGpsnav = {
@ -273,8 +273,8 @@ static OSD_Entry cmsx_menuManualRateProfileEntries[] =
OSD_SETTING_ENTRY("MANU RC EXPO", SETTING_MANUAL_RC_EXPO), OSD_SETTING_ENTRY("MANU RC EXPO", SETTING_MANUAL_RC_EXPO),
OSD_SETTING_ENTRY("MANU RC YAW EXP", SETTING_MANUAL_RC_YAW_EXPO), OSD_SETTING_ENTRY("MANU RC YAW EXP", SETTING_MANUAL_RC_YAW_EXPO),
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
static CMS_Menu cmsx_menuManualRateProfile = { static CMS_Menu cmsx_menuManualRateProfile = {
@ -313,8 +313,8 @@ static OSD_Entry cmsx_menuRateProfileEntries[] =
OSD_SETTING_ENTRY("THRPID ATT", SETTING_TPA_RATE), OSD_SETTING_ENTRY("THRPID ATT", SETTING_TPA_RATE),
OSD_SETTING_ENTRY_STEP("TPA BRKPT", SETTING_TPA_BREAKPOINT, 10), OSD_SETTING_ENTRY_STEP("TPA BRKPT", SETTING_TPA_BREAKPOINT, 10),
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
static CMS_Menu cmsx_menuRateProfile = { static CMS_Menu cmsx_menuRateProfile = {
@ -372,8 +372,8 @@ static OSD_Entry cmsx_menuProfileOtherEntries[] = {
{ "HORZN STR", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_horizonStrength, 0, 200, 1 } , 0 }, { "HORZN STR", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_horizonStrength, 0, 200, 1 } , 0 },
{ "HORZN TRS", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_horizonTransition, 0, 200, 1 } , 0 }, { "HORZN TRS", OME_UINT8, NULL, &(OSD_UINT8_t){ &cmsx_horizonTransition, 0, 200, 1 } , 0 },
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
static CMS_Menu cmsx_menuProfileOther = { static CMS_Menu cmsx_menuProfileOther = {
@ -400,8 +400,8 @@ static OSD_Entry cmsx_menuFilterPerProfileEntries[] =
OSD_SETTING_ENTRY("YAW P LIM", SETTING_YAW_P_LIMIT), OSD_SETTING_ENTRY("YAW P LIM", SETTING_YAW_P_LIMIT),
OSD_SETTING_ENTRY("YAW LPF", SETTING_YAW_LPF_HZ), OSD_SETTING_ENTRY("YAW LPF", SETTING_YAW_LPF_HZ),
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
static CMS_Menu cmsx_menuFilterPerProfile = { static CMS_Menu cmsx_menuFilterPerProfile = {
@ -423,8 +423,8 @@ static OSD_Entry cmsx_menuGyroEntries[] =
OSD_SETTING_ENTRY("GYRO DENOM", SETTING_GYRO_SYNC_DENOM), OSD_SETTING_ENTRY("GYRO DENOM", SETTING_GYRO_SYNC_DENOM),
OSD_SETTING_ENTRY("GYRO LPF", SETTING_GYRO_HARDWARE_LPF), OSD_SETTING_ENTRY("GYRO LPF", SETTING_GYRO_HARDWARE_LPF),
{"BACK", OME_Back, NULL, NULL, 0}, OSD_BACK_ENTRY,
{NULL, OME_END, NULL, NULL, 0} OSD_END_ENTRY,
}; };
static CMS_Menu cmsx_menuGyro = { static CMS_Menu cmsx_menuGyro = {
@ -463,8 +463,8 @@ static OSD_Entry cmsx_menuImuEntries[] =
{"FILT GLB", OME_Submenu, cmsMenuChange, &cmsx_menuFilterGlobal, 0}, {"FILT GLB", OME_Submenu, cmsMenuChange, &cmsx_menuFilterGlobal, 0},
#endif #endif
{"BACK", OME_Back, NULL, NULL, 0}, OSD_BACK_ENTRY,
{NULL, OME_END, NULL, NULL, 0} OSD_END_ENTRY,
}; };
CMS_Menu cmsx_menuImu = { CMS_Menu cmsx_menuImu = {

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

@ -61,8 +61,8 @@ static OSD_Entry cmsx_menuLedstripEntries[] =
{ "-- LED STRIP --", OME_Label, NULL, NULL, 0 }, { "-- LED STRIP --", OME_Label, NULL, NULL, 0 },
{ "ENABLED", OME_BoolFunc, NULL, cmsx_FeatureLedStrip_Enabled, 0 }, { "ENABLED", OME_BoolFunc, NULL, cmsx_FeatureLedStrip_Enabled, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
CMS_Menu cmsx_menuLedstrip = { CMS_Menu cmsx_menuLedstrip = {

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

@ -66,8 +66,8 @@ static OSD_Entry cmsx_menuRcEntries[] =
{ "AUX3", OME_INT16, NULL, &(OSD_INT16_t){ &rcData[AUX3], 1, 2500, 0 }, DYNAMIC }, { "AUX3", OME_INT16, NULL, &(OSD_INT16_t){ &rcData[AUX3], 1, 2500, 0 }, DYNAMIC },
{ "AUX4", OME_INT16, NULL, &(OSD_INT16_t){ &rcData[AUX4], 1, 2500, 0 }, DYNAMIC }, { "AUX4", OME_INT16, NULL, &(OSD_INT16_t){ &rcData[AUX4], 1, 2500, 0 }, DYNAMIC },
{ "BACK", OME_Back, NULL, NULL, 0}, OSD_BACK_ENTRY,
{NULL, OME_END, NULL, NULL, 0} OSD_END_ENTRY,
}; };
CMS_Menu cmsx_menuRcPreview = { CMS_Menu cmsx_menuRcPreview = {
@ -102,8 +102,8 @@ static OSD_Entry menuMiscEntries[]=
{ "RC PREV", OME_Submenu, cmsMenuChange, &cmsx_menuRcPreview, 0}, { "RC PREV", OME_Submenu, cmsMenuChange, &cmsx_menuRcPreview, 0},
{ "BACK", OME_Back, NULL, NULL, 0}, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0} OSD_END_ENTRY,
}; };
CMS_Menu cmsx_menuMisc = { CMS_Menu cmsx_menuMisc = {

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("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("MID THR FOR AH", SETTING_NAV_USE_MIDTHR_FOR_ALTHOLD),
OSD_SETTING_ENTRY("MC HOVER THR", SETTING_NAV_MC_HOVER_THR), 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 = { 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("MIN RTH DISTANCE", SETTING_NAV_MIN_RTH_DISTANCE),
OSD_SETTING_ENTRY("RTH ABORT THRES", SETTING_NAV_RTH_ABORT_THRESHOLD), OSD_SETTING_ENTRY("RTH ABORT THRES", SETTING_NAV_RTH_ABORT_THRESHOLD),
OSD_SETTING_ENTRY("EMERG LANDING SPEED", SETTING_NAV_EMERG_LANDING_SPEED), 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 = { 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("MAX DIVE ANGLE", SETTING_NAV_FW_DIVE_ANGLE),
OSD_SETTING_ENTRY("PITCH TO THR RATIO", SETTING_NAV_FW_PITCH2THR), OSD_SETTING_ENTRY("PITCH TO THR RATIO", SETTING_NAV_FW_PITCH2THR),
OSD_SETTING_ENTRY("LOITER RADIUS", SETTING_NAV_FW_LOITER_RADIUS), 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 = { static CMS_Menu cmsx_menuFixedWing = {
@ -125,8 +128,9 @@ static OSD_Entry cmsx_menuNavigationEntries[] =
{ "BASIC SETTINGS", OME_Submenu, cmsMenuChange, &cmsx_menuNavSettings, 0}, { "BASIC SETTINGS", OME_Submenu, cmsMenuChange, &cmsx_menuNavSettings, 0},
{ "RTH", OME_Submenu, cmsMenuChange, &cmsx_menuRTH, 0}, { "RTH", OME_Submenu, cmsMenuChange, &cmsx_menuRTH, 0},
{ "FIXED WING", OME_Submenu, cmsMenuChange, &cmsx_menuFixedWing, 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 = { CMS_Menu cmsx_menuNavigation = {

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

@ -41,8 +41,8 @@ OSD_Entry cmsx_menuAlarmsEntries[] =
OSD_SETTING_ENTRY("FLY TIME", SETTING_OSD_TIME_ALARM), OSD_SETTING_ENTRY("FLY TIME", SETTING_OSD_TIME_ALARM),
OSD_SETTING_ENTRY("MAX ALT", SETTING_OSD_ALT_ALARM), OSD_SETTING_ENTRY("MAX ALT", SETTING_OSD_ALT_ALARM),
{"BACK", OME_Back, NULL, NULL, 0}, OSD_BACK_ENTRY,
{NULL, OME_END, NULL, NULL, 0} OSD_END_ENTRY,
}; };
CMS_Menu cmsx_menuAlarms = { CMS_Menu cmsx_menuAlarms = {
@ -104,8 +104,9 @@ OSD_Entry menuOsdActiveElemsEntries[] =
#endif // defined #endif // defined
{"ALTITUDE", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_ALTITUDE], 0}, {"ALTITUDE", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_ALTITUDE], 0},
{"AIR SPEED", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_AIR_SPEED], 0}, {"AIR SPEED", OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_AIR_SPEED], 0},
{"BACK", OME_Back, NULL, NULL, 0},
{NULL, OME_END, NULL, NULL, 0} OSD_BACK_ENTRY,
OSD_END_ENTRY,
}; };
CMS_Menu menuOsdActiveElems = { CMS_Menu menuOsdActiveElems = {
@ -123,8 +124,9 @@ OSD_Entry cmsx_menuOsdLayoutEntries[] =
{ {
{"---SCREEN LAYOUT---", OME_Label, NULL, NULL, 0}, {"---SCREEN LAYOUT---", OME_Label, NULL, NULL, 0},
{"ACTIVE ELEM", OME_Submenu, cmsMenuChange, &menuOsdActiveElems, 0}, {"ACTIVE ELEM", OME_Submenu, cmsMenuChange, &menuOsdActiveElems, 0},
{"BACK", OME_Back, NULL, NULL, 0},
{NULL, OME_END, NULL, NULL, 0} OSD_BACK_ENTRY,
OSD_END_ENTRY,
}; };
CMS_Menu cmsx_menuOsdLayout = { CMS_Menu cmsx_menuOsdLayout = {

5
src/main/cms/cms_menu_vtx.c
View file

@ -127,8 +127,9 @@ static OSD_Entry cmsx_menuVtxEntries[] =
#ifdef USE_RTC6705 #ifdef USE_RTC6705
{"LOW POWER", OME_Bool, NULL, &masterConfig.vtx_power, 0}, {"LOW POWER", OME_Bool, NULL, &masterConfig.vtx_power, 0},
#endif // USE_RTC6705 #endif // USE_RTC6705
{"BACK", OME_Back, NULL, NULL, 0},
{NULL, OME_END, NULL, NULL, 0} OSD_BACK_ENTRY,
OSD_END_ENTRY,
}; };
CMS_Menu cmsx_menuVtx = { CMS_Menu cmsx_menuVtx = {

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

@ -316,8 +316,9 @@ static OSD_Entry saCmsMenuStatsEntries[] = {
{ "BADLEN", OME_UINT16, NULL, &(OSD_UINT16_t){ &saStat.badlen, 0, 0, 0 }, DYNAMIC }, { "BADLEN", OME_UINT16, NULL, &(OSD_UINT16_t){ &saStat.badlen, 0, 0, 0 }, DYNAMIC },
{ "CRCERR", OME_UINT16, NULL, &(OSD_UINT16_t){ &saStat.crc, 0, 0, 0 }, DYNAMIC }, { "CRCERR", OME_UINT16, NULL, &(OSD_UINT16_t){ &saStat.crc, 0, 0, 0 }, DYNAMIC },
{ "OOOERR", OME_UINT16, NULL, &(OSD_UINT16_t){ &saStat.ooopresp, 0, 0, 0 }, DYNAMIC }, { "OOOERR", OME_UINT16, NULL, &(OSD_UINT16_t){ &saStat.ooopresp, 0, 0, 0 }, DYNAMIC },
{ "BACK", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 } OSD_BACK_ENTRY,
OSD_END_ENTRY,
}; };
static CMS_Menu saCmsMenuStats = { static CMS_Menu saCmsMenuStats = {
@ -481,8 +482,8 @@ static OSD_Entry saCmsMenuPORFreqEntries[] = {
{ "NEW FREQ", OME_UINT16, NULL, &(OSD_UINT16_t){ &saCmsORFreqNew, 5000, 5900, 1 }, 0 }, { "NEW FREQ", OME_UINT16, NULL, &(OSD_UINT16_t){ &saCmsORFreqNew, 5000, 5900, 1 }, 0 },
{ "SET", OME_Funcall, saCmsSetPORFreq, NULL, 0 }, { "SET", OME_Funcall, saCmsSetPORFreq, NULL, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
static CMS_Menu saCmsMenuPORFreq = static CMS_Menu saCmsMenuPORFreq =
@ -504,8 +505,8 @@ static OSD_Entry saCmsMenuUserFreqEntries[] = {
{ "NEW FREQ", OME_UINT16, NULL, &(OSD_UINT16_t){ &saCmsUserFreqNew, 5000, 5900, 1 }, 0 }, { "NEW FREQ", OME_UINT16, NULL, &(OSD_UINT16_t){ &saCmsUserFreqNew, 5000, 5900, 1 }, 0 },
{ "SET", OME_Funcall, saCmsConfigUserFreq, NULL, 0 }, { "SET", OME_Funcall, saCmsConfigUserFreq, NULL, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
static CMS_Menu saCmsMenuUserFreq = static CMS_Menu saCmsMenuUserFreq =
@ -531,8 +532,8 @@ static OSD_Entry saCmsMenuConfigEntries[] = {
{ "POR FREQ", OME_Submenu, (CMSEntryFuncPtr)saCmsORFreqGetString, &saCmsMenuPORFreq, OPTSTRING }, { "POR FREQ", OME_Submenu, (CMSEntryFuncPtr)saCmsORFreqGetString, &saCmsMenuPORFreq, OPTSTRING },
{ "STATX", OME_Submenu, cmsMenuChange, &saCmsMenuStats, 0 }, { "STATX", OME_Submenu, cmsMenuChange, &saCmsMenuStats, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
static CMS_Menu saCmsMenuConfig = { static CMS_Menu saCmsMenuConfig = {
@ -551,8 +552,8 @@ static OSD_Entry saCmsMenuCommenceEntries[] = {
{ "YES", OME_Funcall, saCmsCommence, NULL, 0 }, { "YES", OME_Funcall, saCmsCommence, NULL, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
static CMS_Menu saCmsMenuCommence = { static CMS_Menu saCmsMenuCommence = {
@ -575,8 +576,8 @@ static OSD_Entry saCmsMenuFreqModeEntries[] = {
{ "SET", OME_Submenu, cmsMenuChange, &saCmsMenuCommence, 0 }, { "SET", OME_Submenu, cmsMenuChange, &saCmsMenuCommence, 0 },
{ "CONFIG", OME_Submenu, cmsMenuChange, &saCmsMenuConfig, 0 }, { "CONFIG", OME_Submenu, cmsMenuChange, &saCmsMenuConfig, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
static OSD_Entry saCmsMenuChanModeEntries[] = static OSD_Entry saCmsMenuChanModeEntries[] =
@ -591,8 +592,8 @@ static OSD_Entry saCmsMenuChanModeEntries[] =
{ "SET", OME_Submenu, cmsMenuChange, &saCmsMenuCommence, 0 }, { "SET", OME_Submenu, cmsMenuChange, &saCmsMenuCommence, 0 },
{ "CONFIG", OME_Submenu, cmsMenuChange, &saCmsMenuConfig, 0 }, { "CONFIG", OME_Submenu, cmsMenuChange, &saCmsMenuConfig, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
static OSD_Entry saCmsMenuOfflineEntries[] = static OSD_Entry saCmsMenuOfflineEntries[] =
@ -602,8 +603,8 @@ static OSD_Entry saCmsMenuOfflineEntries[] =
{ "", OME_LabelFunc, NULL, saCmsDrawStatusString, DYNAMIC }, { "", OME_LabelFunc, NULL, saCmsDrawStatusString, DYNAMIC },
{ "STATX", OME_Submenu, cmsMenuChange, &saCmsMenuStats, 0 }, { "STATX", OME_Submenu, cmsMenuChange, &saCmsMenuStats, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
CMS_Menu cmsx_menuVtxSmartAudio; // Forward CMS_Menu cmsx_menuVtxSmartAudio; // Forward

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

@ -199,8 +199,9 @@ static long trampCmsOnEnter(void)
static OSD_Entry trampCmsMenuCommenceEntries[] = { static OSD_Entry trampCmsMenuCommenceEntries[] = {
{ "CONFIRM", OME_Label, NULL, NULL, 0 }, { "CONFIRM", OME_Label, NULL, NULL, 0 },
{ "YES", OME_Funcall, trampCmsCommence, NULL, 0 }, { "YES", OME_Funcall, trampCmsCommence, NULL, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 } OSD_BACK_ENTRY,
OSD_END_ENTRY,
}; };
static CMS_Menu trampCmsMenuCommence = { static CMS_Menu trampCmsMenuCommence = {
@ -227,8 +228,8 @@ static OSD_Entry trampMenuEntries[] =
{ "T(C)", OME_INT16, NULL, &trampCmsEntTemp, DYNAMIC }, { "T(C)", OME_INT16, NULL, &trampCmsEntTemp, DYNAMIC },
{ "SET", OME_Submenu, cmsMenuChange, &trampCmsMenuCommence, 0 }, { "SET", OME_Submenu, cmsMenuChange, &trampCmsMenuCommence, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 }, OSD_BACK_ENTRY,
{ NULL, OME_END, NULL, NULL, 0 } OSD_END_ENTRY,
}; };
CMS_Menu cmsx_menuVtxTramp = { CMS_Menu cmsx_menuVtxTramp = {

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

@ -75,6 +75,9 @@ typedef struct
#define DYNAMIC (1 << 2) // Value should be updated dynamically #define DYNAMIC (1 << 2) // Value should be updated dynamically
#define OPTSTRING (1 << 3) // (Temporary) Flag for OME_Submenu, indicating func should be called to get a string to display. #define OPTSTRING (1 << 3) // (Temporary) Flag for OME_Submenu, indicating func should be called to get a string to display.
#define OSD_BACK_ENTRY ((OSD_Entry){ "BACK", OME_Back, NULL, NULL, 0 })
#define OSD_END_ENTRY ((OSD_Entry){ NULL, OME_END, NULL, NULL, 0 })
// Data type for OME_Setting. Uses upper 4 bits // Data type for OME_Setting. Uses upper 4 bits
// of flags, leaving 16 data types. // of flags, leaving 16 data types.
#define CMS_DATA_TYPE_OFFSET (4) #define CMS_DATA_TYPE_OFFSET (4)