Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-16 04:45:17 +03:00
Code Issues Wiki Activity

Change binaries version (origin added: otx / frsky / tbs / radiomaster)

Browse source
This commit is contained in:
Bertrand Songis 2020-06-09 10:46:22 +02:00
parent 563761c114
commit 38f6d5772f
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
6 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
companion/src/helpers.cpp
View file

@ -565,7 +565,6 @@ QPixmap makePixMap(const QImage & image)
return QPixmap::fromImage(result); return QPixmap::fromImage(result);
} }
int version2index(const QString & version) int version2index(const QString & version)
{ {
int result = 999; int result = 999;

1
companion/src/mainwindow.cpp
View file

@ -360,7 +360,6 @@ void MainWindow::checkForCompanionUpdateFinished(QNetworkReply * reply)
return onUpdatesError(tr("Companion update check failed, new version information not found.")); return onUpdatesError(tr("Companion update check failed, new version information not found."));
int webVersion = version2index(version); int webVersion = version2index(version);
int ownVersion = version2index(VERSION); int ownVersion = version2index(VERSION);
if (ownVersion < webVersion) { if (ownVersion < webVersion) {

2
companion/src/storage/firmwareinterface.cpp
View file

@ -36,7 +36,6 @@
FirmwareInterface::FirmwareInterface(const QString & filename): FirmwareInterface::FirmwareInterface(const QString & filename):
flash(FSIZE_MAX, 0), flash(FSIZE_MAX, 0),
flashSize(0), flashSize(0),
versionId(0),
eepromVersion(0), eepromVersion(0),
eepromVariant(0), eepromVariant(0),
splashOffset(0), splashOffset(0),
@ -80,7 +79,6 @@ FirmwareInterface::FirmwareInterface(const QString & filename):
eepromVersion = eepromId.toInt(); eepromVersion = eepromId.toInt();
} }
versionId = version2index(version);
seekSplash(); seekSplash();
isValidFlag = !version.isEmpty(); isValidFlag = !version.isEmpty();
} }

2
companion/src/storage/firmwareinterface.h
View file

@ -46,7 +46,6 @@ class FirmwareInterface
QString getFlavour() const; QString getFlavour() const;
bool isHardwareCompatible(const FirmwareInterface &previousFirmware) const; bool isHardwareCompatible(const FirmwareInterface &previousFirmware) const;
inline QString getVersion() { return version; } inline QString getVersion() { return version; }
unsigned int getVersionId() { return versionId; }
inline int getEEpromVersion() { return eepromVersion; } inline int getEEpromVersion() { return eepromVersion; }
inline int getEEpromVariant() { return eepromVariant; } inline int getEEpromVariant() { return eepromVariant; }
inline QString getEEpromId() { return eepromId; } inline QString getEEpromId() { return eepromId; }
@ -72,7 +71,6 @@ class FirmwareInterface
QString time; QString time;
QString flavour; QString flavour;
QString version; QString version;
int versionId;
QString eepromId; QString eepromId;
int eepromVersion; int eepromVersion;
int eepromVariant; int eepromVariant;

5
radio/src/CMakeLists.txt
View file

@ -52,6 +52,7 @@ option(MODULE_PROTOCOL_FCC "Add support for FCC modules" ON)
option(MODULE_PROTOCOL_LBT "Add support for EU/LBT modules" ON) option(MODULE_PROTOCOL_LBT "Add support for EU/LBT modules" ON)
option(MODULE_PROTOCOL_FLEX "Add support for non certified FLEX modules" OFF) option(MODULE_PROTOCOL_FLEX "Add support for non certified FLEX modules" OFF)
option(MODULE_PROTOCOL_D8 "Add support for D8 modules" ON) option(MODULE_PROTOCOL_D8 "Add support for D8 modules" ON)
option(OTX_RELEASE "Used to build OpenTX released firmware" OFF)
option(FRSKY_RELEASE "Used to build FrSky released firmware" OFF) option(FRSKY_RELEASE "Used to build FrSky released firmware" OFF)
option(TBS_RELEASE "Used to build TBS released firmware" OFF) option(TBS_RELEASE "Used to build TBS released firmware" OFF)
option(ALLOW_TRAINER_MULTI "Allow multi trainer" OFF) option(ALLOW_TRAINER_MULTI "Allow multi trainer" OFF)
@ -336,6 +337,10 @@ if(MODULE_PROTOCOL_D8)
add_definitions(-DMODULE_PROTOCOL_D8) add_definitions(-DMODULE_PROTOCOL_D8)
endif() endif()
if(OTX_RELEASE)
add_definitions(-DOTX_RELEASE)
endif()
if(JUMPER_RELEASE) if(JUMPER_RELEASE)
add_definitions(-DJUMPER_RELEASE) add_definitions(-DJUMPER_RELEASE)
endif() endif()

18
radio/src/stamp.cpp
View file

@ -33,26 +33,28 @@
#endif #endif
#if defined(FRSKY_RELEASE) #if defined(FRSKY_RELEASE)
#define DISPLAY_VERSION "FrSky" #define DISPLAY_VERSION "-frsky"
#elif defined(JUMPER_RELEASE) #elif defined(JUMPER_RELEASE)
#define DISPLAY_VERSION "JumperRC" #define DISPLAY_VERSION "-jumper"
#elif defined(RADIOMASTER_RELEASE) #elif defined(RADIOMASTER_RELEASE)
#define DISPLAY_VERSION "Radiomaster" #define DISPLAY_VERSION "-radiomaster"
#elif defined(TBS_RELEASE) #elif defined(TBS_RELEASE)
#define DISPLAY_VERSION "TBS" #define DISPLAY_VERSION "-tbs"
#elif defined(OTX_RELEASE)
#define DISPLAY_VERSION "-otx"
#else #else
#define DISPLAY_VERSION VERSION #define DISPLAY_VERSION
#endif #endif
#if defined(COLORLCD) #if defined(COLORLCD)
const char vers_stamp[] = "VERS" TAB ": " "opentx-" FLAVOUR "-" DISPLAY_VERSION " (" GIT_STR ")"; const char vers_stamp[] = "VERS" TAB ": " "opentx-" FLAVOUR "-" VERSION 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 ": " DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; const char vers_stamp[] = "FW" TAB ": opentx-" BOARD_NAME "\036VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
#else #else
const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": " DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR;
#endif #endif
/** /**