feat: Add PR number to version string on PR builds (#1887)
* Add PR number to version string * Testing another way * Decide according to GitHub ref type how to parse and where to output. Prioritize EDGETX_VERSION_TAG, if set, else resort to EDGETX_VERSION_SUFFIX, if set. Adjust also firmware_version and boot_version strings and adjist bootloader title. * Consider also B/W. * B&W: omit GIT SHA if tagged, otherwise own line Omit GIT SHA from version string if a tagged version. Otherwise, show on own line since is too long for 128x64 B&W displays. Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
@@ -25,9 +25,17 @@
|
||||
#include "stamp.h"
|
||||
|
||||
#if LCD_W < 212
|
||||
#define BOOTLOADER_TITLE " Bootloader - " VERSION
|
||||
#if defined(VERSION_TAG)
|
||||
#define BOOTLOADER_TITLE " Bootloader - " VERSION_TAG
|
||||
#else
|
||||
#define BOOTLOADER_TITLE " Bootloader " VERSION "-" VERSION_SUFFIX
|
||||
#endif
|
||||
#else
|
||||
#define BOOTLOADER_TITLE " EdgeTX Bootloader - " VERSION
|
||||
#if defined(VERSION_TAG)
|
||||
#define BOOTLOADER_TITLE " EdgeTX Bootloader - " VERSION_TAG
|
||||
#else
|
||||
#define BOOTLOADER_TITLE " EdgeTX Bootloader - " VERSION "-" VERSION_SUFFIX
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define DISPLAY_CHAR_WIDTH (LCD_COLS+4)
|
||||
|
||||
Reference in New Issue
Block a user