feat(minor): Better showing of version info in firmware and cpn, remove seperate cpn32 build script (#1913)

* fix: Prevent potential wordsplitting of variables

* chore: Remove need for separate cpn 32bit script

* Build script tag/branch/PR auto-detection

* Teach companion about VERSION_TAG

* Update some constant names

* Only one companion build script

* Actually use `VERSION_SUFFIX` in about screen 🤦

* Add space

* Remove line that was only for testing 32bit build

* Remove hyphen between win and bits

* Show codename in Settings -> Version

* cpn: Only show codename on tagged versions

* Update about screen also

* Double quotes around codename on colorlcd

* Update copyright year

* About screen should use VERSION_TAG when set
This commit is contained in:
Peter Feerick
2022-05-08 16:24:31 +10:00
committed by GitHub
parent 5196c2a916
commit b0e3cb015f
16 changed files with 80 additions and 331 deletions
+8 -4
View File
@@ -24,8 +24,12 @@
#define ABOUT_INDENT 4
const char ABOUT_VERSION_1[] = "EdgeTX " CODENAME "(" VERSION ")";
const char ABOUT_VERSION_2[] = "Copyright (C) 2021 EdgeTX";
#if defined(VERSION_TAG)
const char ABOUT_VERSION_1[] = "EdgeTX " "(" VERSION_TAG ")" "\036\"" CODENAME "\"";
#else
const char ABOUT_VERSION_1[] = "EdgeTX " "(" VERSION "-" VERSION_SUFFIX ")";
#endif
const char ABOUT_VERSION_2[] = "Copyright (C) 2022 EdgeTX";
const char ABOUT_VERSION_3[] = "https://edgetx.org";
void menuAboutView(event_t event)
@@ -41,6 +45,6 @@ void menuAboutView(event_t event)
lcdDrawText(1, 0, STR_ABOUTUS, DBLSIZE|INVERS);
lcdDrawText(ABOUT_INDENT, 22, ABOUT_VERSION_1, SMLSIZE);
lcdDrawText(ABOUT_INDENT, 30, ABOUT_VERSION_2, SMLSIZE);
lcdDrawText(ABOUT_INDENT, 38, ABOUT_VERSION_3, SMLSIZE);
lcdDrawText(ABOUT_INDENT, 38, ABOUT_VERSION_2, SMLSIZE);
lcdDrawText(ABOUT_INDENT, 46, ABOUT_VERSION_3, SMLSIZE);
}
+6 -2
View File
@@ -24,8 +24,12 @@
#define ABOUT_INDENT 6
const char ABOUT_VERSION_1[] = "EdgeTX " CODENAME "(" VERSION ")";
const char ABOUT_VERSION_2[] = "Copyright (C) 2021 EdgeTX";
#if defined(VERSION_TAG)
const char ABOUT_VERSION_1[] = "EdgeTX " "\"" CODENAME "\"" " (" VERSION_TAG ")";
#else
const char ABOUT_VERSION_1[] = "EdgeTX " "(" VERSION "-" VERSION_SUFFIX ")";
#endif
const char ABOUT_VERSION_2[] = "Copyright (C) 2022 EdgeTX";
const char ABOUT_VERSION_3[] = "https://edgetx.org";
void menuAboutView(event_t event)
+6 -2
View File
@@ -28,8 +28,12 @@ const uint8_t mask_qrcode[] = {
};
constexpr coord_t ABOUT_WIDTH = 220;
const std::string about_str = "EdgeTX" " " CODENAME " (" VERSION ")";
const std::string copyright_str = "Copyright (C) 2021 EdgeTX";
#if defined(VERSION_TAG)
const std::string about_str = "EdgeTX" " " "\"" CODENAME "\" (" VERSION_TAG ")";
#else
const std::string about_str = "EdgeTX" " (" VERSION "-" VERSION_SUFFIX ")";
#endif
const std::string copyright_str = "Copyright (C) 2022 EdgeTX";
AboutUs::AboutUs() :
MessageDialog(MainWindow::instance(), STR_ABOUT_US, "")
+2 -2
View File
@@ -49,7 +49,7 @@
const char vers_stamp[] = "VERS" TAB ": Factory firmware (" GIT_STR ")";
#else
#if defined(VERSION_TAG)
const char vers_stamp[] = "VERS" TAB ": " VERSION_TAG DISPLAY_VERSION;
const char vers_stamp[] = "VERS" TAB ": " VERSION_TAG DISPLAY_VERSION "\"" CODENAME "\"";
#else
const char vers_stamp[] = "VERS" TAB ": " VERSION "-" VERSION_SUFFIX DISPLAY_VERSION " (" GIT_STR ")";
#endif
@@ -65,7 +65,7 @@
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": Factory (" GIT_STR ")" "\036BUILT BY : EdgeTX" "\036DATE" TAB ": " DATE " " TIME "\036CFGV" TAB ": " CFGV_STR;
#else
#if defined(VERSION_TAG)
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": " VERSION_TAG DISPLAY_VERSION "\036DATE" TAB ": " DATE " " TIME "\036CFGV" TAB ": " CFGV_STR;
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": " VERSION_TAG DISPLAY_VERSION "\036NAME" ": " CODENAME "\036DATE" TAB ": " DATE " " TIME "\036CFGV" TAB ": " CFGV_STR;
#else
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": " VERSION "-" VERSION_SUFFIX DISPLAY_VERSION "\036GIT#" TAB ": " GIT_STR "\036DATE" TAB ": " DATE " " TIME "\036CFGV" TAB ": " CFGV_STR;
#endif