mirror of
https://github.com/opentx/opentx.git
synced 2025-07-23 08:15:17 +03:00
Fix stamps handling (#7055)
This commit is contained in:
parent
e473a7e897
commit
82470f3ca0
2 changed files with 13 additions and 11 deletions
|
@ -32,15 +32,23 @@
|
||||||
#define TAB "\037\033"
|
#define TAB "\037\033"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(FRSKY_RELEASE)
|
||||||
|
#define DISPLAY_VERSION "FrSky"
|
||||||
|
#elif defined(JUMPER_RELEASE)
|
||||||
|
#define DISPLAY_VERSION "JumperRC"
|
||||||
|
#else
|
||||||
|
#define DISPLAY_VERSION VERSION
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
const char vers_stamp[] = "VERS" TAB ": " "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")";
|
const char vers_stamp[] = "VERS" TAB ": " "opentx-" FLAVOUR "-" DISPLAY_VERSION " (" GIT_STR ")";
|
||||||
const char date_stamp[] = "DATE" TAB ": " DATE;
|
const char date_stamp[] = "DATE" TAB ": " DATE;
|
||||||
const char time_stamp[] = "TIME" TAB ": " TIME;
|
const char time_stamp[] = "TIME" TAB ": " TIME;
|
||||||
const char eeprom_stamp[] = "EEPR" TAB ": " EEPROM_STR;
|
const char eeprom_stamp[] = "EEPR" TAB ": " EEPROM_STR;
|
||||||
#elif defined(BOARD_NAME)
|
#elif defined(BOARD_NAME)
|
||||||
const char vers_stamp[] = "FW" TAB ": opentx-" BOARD_NAME "\036VERS" TAB ": " VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
|
const char vers_stamp[] = "FW" TAB ": opentx-" BOARD_NAME "\036VERS" TAB ": " DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
|
||||||
#else
|
#else
|
||||||
const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": " VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
|
const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": " DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -49,8 +57,8 @@
|
||||||
*/
|
*/
|
||||||
#if defined(STM32) && !defined(SIMU)
|
#if defined(STM32) && !defined(SIMU)
|
||||||
|
|
||||||
__SECTION_USED(".fwversiondata") const char firmware_version[] = "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")";
|
__SECTION_USED(".fwversiondata") const char firmware_version[] = "opentx-" FLAVOUR "-" DISPLAY_VERSION " (" GIT_STR ")";
|
||||||
__SECTION_USED(".bootversiondata") const char boot_version[] = "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")";
|
__SECTION_USED(".bootversiondata") const char boot_version[] = "opentx-" FLAVOUR "-" DISPLAY_VERSION " (" GIT_STR ")";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tries to find opentx version in the first 1024 byte of either firmware/bootloader (the one not running) or the buffer
|
* Tries to find opentx version in the first 1024 byte of either firmware/bootloader (the one not running) or the buffer
|
||||||
|
|
|
@ -1,12 +1,6 @@
|
||||||
#define DATE "@DATE@"
|
#define DATE "@DATE@"
|
||||||
#define TIME "@TIME@"
|
#define TIME "@TIME@"
|
||||||
#if defined(FRSKY_RELEASE)
|
|
||||||
#define VERSION "FrSky"
|
|
||||||
#elif defined(JUMPER_RELEASE)
|
|
||||||
#define VERSION "JumperRC"
|
|
||||||
#else
|
|
||||||
#define VERSION "@VERSION@"
|
#define VERSION "@VERSION@"
|
||||||
#endif
|
|
||||||
|
|
||||||
#define VERSION_MAJOR @VERSION_MAJOR@
|
#define VERSION_MAJOR @VERSION_MAJOR@
|
||||||
#define VERSION_MINOR @VERSION_MINOR@
|
#define VERSION_MINOR @VERSION_MINOR@
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue