From c905ed0338dc62d58f88c08358f043c67d0159e0 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 4 Mar 2018 10:19:47 +0100 Subject: [PATCH 1/2] Refresh UUID each run --- radio/src/gui/128x64/radio_version.cpp | 12 +++++------- radio/src/gui/212x64/radio_version.cpp | 8 +++----- radio/src/gui/480x272/radio_version.cpp | 6 ++---- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/radio/src/gui/128x64/radio_version.cpp b/radio/src/gui/128x64/radio_version.cpp index 387ccb99f..1c61ffaf6 100644 --- a/radio/src/gui/128x64/radio_version.cpp +++ b/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,12 @@ void menuRadioVersion(event_t event) NVIC_SystemReset(); } #endif - + #if defined(STM32) char id[27]; - if (event == EVT_ENTRY) { - getCPUUniqueID(id); - } + getCPUUniqueID(id); #endif - + SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, MENU_RADIO_VERSION, 1); lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+FH, vers_stamp); @@ -54,7 +52,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(); } diff --git a/radio/src/gui/212x64/radio_version.cpp b/radio/src/gui/212x64/radio_version.cpp index 7eb6b5ebf..fb864c11a 100644 --- a/radio/src/gui/212x64/radio_version.cpp +++ b/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); diff --git a/radio/src/gui/480x272/radio_version.cpp b/radio/src/gui/480x272/radio_version.cpp index e441a446b..b59faa59a 100644 --- a/radio/src/gui/480x272/radio_version.cpp +++ b/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); From a7a6a3d12497eeb6bcd0f3de5e077944a251f37b Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 4 Mar 2018 13:00:19 +0100 Subject: [PATCH 2/2] Lets not get something you can't display ! --- radio/src/gui/128x64/radio_version.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/radio/src/gui/128x64/radio_version.cpp b/radio/src/gui/128x64/radio_version.cpp index 1c61ffaf6..7b12e61c9 100644 --- a/radio/src/gui/128x64/radio_version.cpp +++ b/radio/src/gui/128x64/radio_version.cpp @@ -31,11 +31,6 @@ void menuRadioVersion(event_t event) } #endif -#if defined(STM32) - char id[27]; - getCPUUniqueID(id); -#endif - SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, MENU_RADIO_VERSION, 1); lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+FH, vers_stamp);