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

New version format (mandatory for small screens)

Browse source
This commit is contained in:
Bertrand Songis 2015-07-23 19:07:06 +02:00
parent c90bf43d17
commit 8f96f50a84
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
companion/src/firmwareinterface.cpp
View file

@ -20,6 +20,7 @@
#include "firmwareinterface.h" #include "firmwareinterface.h"
#include "helpers.h" #include "helpers.h"
#define FW_MARK "FW"
#define VERS_MARK "VERS" #define VERS_MARK "VERS"
#define DATE_MARK "DATE" #define DATE_MARK "DATE"
#define TIME_MARK "TIME" #define TIME_MARK "TIME"
@ -66,8 +67,10 @@ FirmwareInterface::FirmwareInterface(const QString &filename):
} }
if (flash_size > 0) { if (flash_size > 0) {
flavour = seekLabel(FW_MARK);
version = seekLabel(VERS_MARK); version = seekLabel(VERS_MARK);
if (version.startsWith("opentx-")) { if (version.startsWith("opentx-")) {
// old version format
int index = version.lastIndexOf('-'); int index = version.lastIndexOf('-');
flavour = version.mid(0, index); flavour = version.mid(0, index);
version = version.mid(index+1); version = version.mid(index+1);

8
radio/src/gui/Taranis/menu_general_version.cpp
View file

@ -101,10 +101,12 @@ void menuGeneralVersion(uint8_t event)
SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, e_Vers, 1); SIMPLE_MENU(STR_MENUVERSION, menuTabGeneral, e_Vers, 1);
lcd_putsLeft(MENU_HEADER_HEIGHT+FH, vers_stamp); lcd_putsLeft(MENU_HEADER_HEIGHT+1, vers_stamp);
lcd_putsLeft(MENU_HEADER_HEIGHT+5*FH+1, STR_EEBACKUP);
lcd_putsLeft(MENU_HEADER_HEIGHT+6*FH+1, STR_FACTORYRESET);
drawFilledRect(0, MENU_HEADER_HEIGHT+5*FH, LCD_W, 2*FH+1, SOLID);
lcd_putsLeft(MENU_HEADER_HEIGHT+5*FH, STR_EEBACKUP);
lcd_putsLeft(MENU_HEADER_HEIGHT+6*FH, STR_FACTORYRESET);
if (event == EVT_KEY_LONG(KEY_ENTER)) { if (event == EVT_KEY_LONG(KEY_ENTER)) {
backupEeprom(); backupEeprom();
} }

2
radio/src/stamp.cpp
View file

@ -52,5 +52,5 @@
const pm_char time_stamp[] PROGMEM = "TIME\037\050: " TIME_STR; const pm_char time_stamp[] PROGMEM = "TIME\037\050: " TIME_STR;
const pm_char eeprom_stamp[] PROGMEM = "EEPR\037\050: " EEPROM_STR; const pm_char eeprom_stamp[] PROGMEM = "EEPR\037\050: " EEPROM_STR;
#else #else
const pm_char vers_stamp[] PROGMEM = "VERS\037\033: " "opentx-" FLAVOUR "-" VERS_STR "\036DATE\037\033: " DATE_STR"\036TIME\037\033: " TIME_STR "\036EEPR\037\033: " EEPROM_STR; const pm_char vers_stamp[] PROGMEM = "FW\037\033: " "opentx-" FLAVOUR "\036VERS\037\033: " VERS_STR "\036DATE\037\033: " DATE_STR"\036TIME\037\033: " TIME_STR "\036EEPR\037\033: " EEPROM_STR;
#endif #endif