Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 04:15:44 +03:00
Code Issues Wiki Activity

Added missing 'USE_BOARD_INFO' conditionals in cms.c.

Browse source
This commit is contained in:
mikeller 2020-08-16 21:11:53 +12:00
parent 66b7cc7c6a
commit 04d3f7bb74
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -187,6 +187,7 @@ static CMS_Menu cmsx_menuCalibration = {
// Info // Info
#if defined(USE_BOARD_INFO)
static char manufacturerId[MAX_MANUFACTURER_ID_LENGTH + 1]; static char manufacturerId[MAX_MANUFACTURER_ID_LENGTH + 1];
static char boardName[MAX_BOARD_NAME_LENGTH + 1]; static char boardName[MAX_BOARD_NAME_LENGTH + 1];
@ -199,6 +200,7 @@ static const void *cmsx_FirmwareInit(displayPort_t *pDisp)
return NULL; return NULL;
} }
#endif
static const OSD_Entry menuFirmwareEntries[] = { static const OSD_Entry menuFirmwareEntries[] = {
{ "--- INFO ---", OME_Label, NULL, NULL, 0 }, { "--- INFO ---", OME_Label, NULL, NULL, 0 },
@ -206,8 +208,10 @@ static const OSD_Entry menuFirmwareEntries[] = {
{ "FWVER", OME_String, NULL, FC_VERSION_STRING, 0 }, { "FWVER", OME_String, NULL, FC_VERSION_STRING, 0 },
{ "GITREV", OME_String, NULL, __REVISION__, 0 }, { "GITREV", OME_String, NULL, __REVISION__, 0 },
{ "TARGET", OME_String, NULL, __TARGET__, 0 }, { "TARGET", OME_String, NULL, __TARGET__, 0 },
#if defined(USE_BOARD_INFO)
{ "MFR", OME_String, NULL, manufacturerId, 0 }, { "MFR", OME_String, NULL, manufacturerId, 0 },
{ "BOARD", OME_String, NULL, boardName, 0 }, { "BOARD", OME_String, NULL, boardName, 0 },
#endif
{ "--- SETUP ---", OME_Label, NULL, NULL, 0 }, { "--- SETUP ---", OME_Label, NULL, NULL, 0 },
{ "CALIBRATE", OME_Submenu, cmsMenuChange, &cmsx_menuCalibration, 0}, { "CALIBRATE", OME_Submenu, cmsMenuChange, &cmsx_menuCalibration, 0},
{ "BACK", OME_Back, NULL, NULL, 0 }, { "BACK", OME_Back, NULL, NULL, 0 },
@ -219,7 +223,11 @@ CMS_Menu cmsx_menuFirmware = {
.GUARD_text = "MENUFIRMWARE", .GUARD_text = "MENUFIRMWARE",
.GUARD_type = OME_MENU, .GUARD_type = OME_MENU,
#endif #endif
#if defined(USE_BOARD_INFO)
.onEnter = cmsx_FirmwareInit, .onEnter = cmsx_FirmwareInit,
#else
.onEnter = NULL,
#endif
.onExit = NULL, .onExit = NULL,
.onDisplayUpdate = NULL, .onDisplayUpdate = NULL,
.entries = menuFirmwareEntries .entries = menuFirmwareEntries