Merge pull request #5746 from opentx/3djc/fix-version-display

Fix UUID display on version screen
This commit is contained in:
Andre Bernet
2018-03-04 13:04:34 +01:00
committed by GitHub
3 changed files with 8 additions and 19 deletions
-7
View File
@@ -31,13 +31,6 @@ void menuRadioVersion(event_t event)
} }
#endif #endif
#if defined(STM32)
char id[27];
if (event == EVT_ENTRY) {
getCPUUniqueID(id);
}
#endif
SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, MENU_RADIO_VERSION, 1); SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, MENU_RADIO_VERSION, 1);
lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+FH, vers_stamp); lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+FH, vers_stamp);
+1 -3
View File
@@ -30,9 +30,7 @@ void menuRadioVersion(event_t event)
NVIC_SystemReset(); NVIC_SystemReset();
} }
if (event == EVT_ENTRY) { getCPUUniqueID(id);
getCPUUniqueID(id);
}
SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, MENU_RADIO_VERSION, 1); SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, MENU_RADIO_VERSION, 1);
+1 -3
View File
@@ -32,9 +32,7 @@ bool menuRadioVersion(event_t event)
} }
#endif #endif
if (event == EVT_ENTRY) { getCPUUniqueID(id);
getCPUUniqueID(id);
}
SIMPLE_MENU(STR_MENUVERSION, RADIO_ICONS, menuTabGeneral, MENU_RADIO_VERSION, 0); SIMPLE_MENU(STR_MENUVERSION, RADIO_ICONS, menuTabGeneral, MENU_RADIO_VERSION, 0);