chore(firmware): pre prefix for non-release builds (#6596)
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
#if defined(VERSION_TAG)
|
||||
const char ABOUT_VERSION_1[] = "EdgeTX " "(" VERSION_TAG ")" "\036\"" CODENAME "\"";
|
||||
#else
|
||||
const char ABOUT_VERSION_1[] = "EdgeTX " "(" VERSION "-" VERSION_SUFFIX ")";
|
||||
const char ABOUT_VERSION_1[] = "EdgeTX " "(" VERSION_PREFIX VERSION VERSION_SUFFIX ")";
|
||||
#endif
|
||||
const char ABOUT_VERSION_2[] = "Copyright (C) " BUILD_YEAR " EdgeTX";
|
||||
const char ABOUT_VERSION_3[] = "https://edgetx.org";
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#if defined(VERSION_TAG)
|
||||
const char ABOUT_VERSION_1[] = "EdgeTX " "\"" CODENAME "\"" " (" VERSION_TAG ")";
|
||||
#else
|
||||
const char ABOUT_VERSION_1[] = "EdgeTX " "(" VERSION "-" VERSION_SUFFIX ")";
|
||||
const char ABOUT_VERSION_1[] = "EdgeTX " "(" VERSION_PREFIX VERSION VERSION_SUFFIX ")";
|
||||
#endif
|
||||
const char ABOUT_VERSION_2[] = "Copyright (C) " BUILD_YEAR " EdgeTX";
|
||||
const char ABOUT_VERSION_3[] = "https://edgetx.org";
|
||||
|
||||
@@ -33,7 +33,7 @@ const std::string about_str =
|
||||
#else
|
||||
const std::string about_str =
|
||||
"EdgeTX"
|
||||
" (" VERSION "-" VERSION_SUFFIX ")";
|
||||
" (" VERSION_PREFIX VERSION VERSION_SUFFIX ")";
|
||||
#endif
|
||||
const std::string copyright_str = "Copyright (C) " BUILD_YEAR " EdgeTX";
|
||||
const std::string edgetx_url = "https://edgetx.org";
|
||||
|
||||
@@ -28,12 +28,16 @@
|
||||
|
||||
extern void checkSpeakerVolume();
|
||||
|
||||
constexpr const char* strip_leading_hyphen(const char* str) {
|
||||
return (str[0] == '-') ? str + 1 : str;
|
||||
}
|
||||
|
||||
#if defined(VERSION_TAG)
|
||||
const std::string ver_str = "" VERSION_TAG;
|
||||
const std::string nam_str = "" CODENAME;
|
||||
#else
|
||||
const std::string ver_str = "" VERSION;
|
||||
const std::string nam_str = "" VERSION_SUFFIX;
|
||||
const std::string ver_str = "" VERSION_PREFIX VERSION;
|
||||
const std::string nam_str = strip_leading_hyphen("" VERSION_SUFFIX);
|
||||
const std::string git_str = "(" GIT_STR ")";
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user