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

Fix UUID display on version screen

radio/src/gui/128x64/radio_version.cpp

@@ -2,7 +2,7 @@
  * Copyright (C) OpenTX
  *
  * Based on code named
- *   th9x - http://code.google.com/p/th9x 
+ *   th9x - http://code.google.com/p/th9x
  *   er9x - http://code.google.com/p/er9x
  *   gruvin9x - http://code.google.com/p/gruvin9x
  *
@@ -30,14 +30,7 @@ void menuRadioVersion(event_t event)
     NVIC_SystemReset();
   }
 #endif
-  
-#if defined(STM32)
-  char id[27];
-  if (event == EVT_ENTRY) {
-    getCPUUniqueID(id);
-  }
-#endif
-  
+
   SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, MENU_RADIO_VERSION, 1);
 
   lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+FH, vers_stamp);
@@ -54,7 +47,7 @@ void menuRadioVersion(event_t event)
   lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+5*FH+1, STR_EEBACKUP);
   lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+6*FH+1, STR_FACTORYRESET);
   lcdDrawFilledRect(0, MENU_HEADER_HEIGHT+5*FH, LCD_W, 2*FH+1, SOLID);
-  
+
   if (event == EVT_KEY_LONG(KEY_ENTER)) {
     eepromBackup();
   }

radio/src/gui/212x64/radio_version.cpp

@@ -2,7 +2,7 @@
  * Copyright (C) OpenTX
  *
  * Based on code named
- *   th9x - http://code.google.com/p/th9x 
+ *   th9x - http://code.google.com/p/th9x
  *   er9x - http://code.google.com/p/er9x
  *   gruvin9x - http://code.google.com/p/gruvin9x
  *
@@ -30,10 +30,8 @@ void menuRadioVersion(event_t event)
     NVIC_SystemReset();
   }
 
-  if (event == EVT_ENTRY) {
-    getCPUUniqueID(id);
-  }
-  
+  getCPUUniqueID(id);
+
   SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, MENU_RADIO_VERSION, 1);
 
   lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+1, vers_stamp);

radio/src/gui/480x272/radio_version.cpp

@@ -2,7 +2,7 @@
  * Copyright (C) OpenTX
  *
  * Based on code named
- *   th9x - http://code.google.com/p/th9x 
+ *   th9x - http://code.google.com/p/th9x
  *   er9x - http://code.google.com/p/er9x
  *   gruvin9x - http://code.google.com/p/gruvin9x
  *
@@ -32,9 +32,7 @@ bool menuRadioVersion(event_t event)
   }
 #endif
 
-  if (event == EVT_ENTRY) {
-    getCPUUniqueID(id);
-  }
+  getCPUUniqueID(id);
 
   SIMPLE_MENU(STR_MENUVERSION, RADIO_ICONS, menuTabGeneral, MENU_RADIO_VERSION, 0);