From 74f8df3a554bb4ab1b543e2ab8e07a3d28486f39 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Thu, 1 Jan 2015 13:17:22 +0100
Subject: [PATCH] #1876 - Companion now recognizes the radio type from the
 binary file

---
 companion/src/firmwareinterface.cpp | 7 ++++++-
 companion/src/firmwareinterface.h   | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/companion/src/firmwareinterface.cpp b/companion/src/firmwareinterface.cpp
index 4eb15f065..b0a4c5729 100755
--- a/companion/src/firmwareinterface.cpp
+++ b/companion/src/firmwareinterface.cpp
@@ -67,6 +67,11 @@ FirmwareInterface::FirmwareInterface(const QString &filename):
 
   if (flash_size > 0) {
     version = seekLabel(VERS_MARK);
+    if (version.startsWith("opentx-")) {
+      int index = version.lastIndexOf('-');
+      flavour = version.mid(0, index);
+      version = version.mid(index+1);
+    }
     date = seekLabel(DATE_MARK);
     time = seekLabel(TIME_MARK);
     eepromId = seekLabel(EEPR_MARK);
@@ -94,7 +99,7 @@ QString FirmwareInterface::seekString(const QString & string)
   if (start > 0) {
     start += string.length();
     int end = -1;
-    for (int i=start; i<start+20; i++) {
+    for (int i=start; i<start+50; i++) {
       char c = flash.at(i);
       if (c == '\0' || c == '\036') {
         end = i;
diff --git a/companion/src/firmwareinterface.h b/companion/src/firmwareinterface.h
index e24a0450c..2a46e9cbe 100755
--- a/companion/src/firmwareinterface.h
+++ b/companion/src/firmwareinterface.h
@@ -46,6 +46,7 @@ class FirmwareInterface
     inline QString getDate() { return date; }
     inline QString getTime() { return time; }
     int getSize() { return flash_size; }
+    inline QString getFlavour() { return flavour; }
     inline QString getVersion() { return version; }
     unsigned int getVersionId() { return versionId; }
     inline int getEEpromVersion() { return eepromVersion; }
@@ -71,6 +72,7 @@ class FirmwareInterface
     QString filename;
     QString date;
     QString time;
+    QString flavour;
     QString version;
     int versionId;
     QString eepromId;