From 8f96f50a84ce0f44ea684bc457cc5d31f1a05274 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 23 Jul 2015 19:07:06 +0200
Subject: [PATCH] New version format (mandatory for small screens)

---
 companion/src/firmwareinterface.cpp            | 3 +++
 radio/src/gui/Taranis/menu_general_version.cpp | 8 +++++---
 radio/src/stamp.cpp                            | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/companion/src/firmwareinterface.cpp b/companion/src/firmwareinterface.cpp
index 0fa9c559f..b812f9444 100755
--- a/companion/src/firmwareinterface.cpp
+++ b/companion/src/firmwareinterface.cpp
@@ -20,6 +20,7 @@
 #include "firmwareinterface.h"
 #include "helpers.h"
 
+#define FW_MARK     "FW"
 #define VERS_MARK   "VERS"
 #define DATE_MARK   "DATE"
 #define TIME_MARK   "TIME"
@@ -66,8 +67,10 @@ FirmwareInterface::FirmwareInterface(const QString &filename):
   }
 
   if (flash_size > 0) {
+    flavour = seekLabel(FW_MARK);
     version = seekLabel(VERS_MARK);
     if (version.startsWith("opentx-")) {
+      // old version format
       int index = version.lastIndexOf('-');
       flavour = version.mid(0, index);
       version = version.mid(index+1);
diff --git a/radio/src/gui/Taranis/menu_general_version.cpp b/radio/src/gui/Taranis/menu_general_version.cpp
index 2aea29b2b..ca1154d88 100755
--- a/radio/src/gui/Taranis/menu_general_version.cpp
+++ b/radio/src/gui/Taranis/menu_general_version.cpp
@@ -101,10 +101,12 @@ void menuGeneralVersion(uint8_t event)
   
   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)) {
     backupEeprom();
   }
diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp
index 6bbd73037..a99d289c0 100644
--- a/radio/src/stamp.cpp
+++ b/radio/src/stamp.cpp
@@ -52,5 +52,5 @@
   const pm_char time_stamp[] PROGMEM =   "TIME\037\050: " TIME_STR;
   const pm_char eeprom_stamp[] PROGMEM = "EEPR\037\050: " EEPROM_STR;
 #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