From 5ad4543d918c43c9bad39c378ee6975f434bdaf4 Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Wed, 23 Apr 2014 14:43:57 +0200
Subject: [PATCH] Taranis Plus support in companion - DON'T FORGET COMPILE
 SCRIPT

---
 companion/src/eeprominterface.cpp              |  1 +
 companion/src/eeprominterface.h                |  5 +++--
 .../src/firmwares/opentx/opentxinterface.cpp   | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 868e107ce..83aab80b3 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -1191,6 +1191,7 @@ void RegisterEepromInterfaces()
   eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_GRUVIN9X));
   eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_SKY9X));
   eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS));
+  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_PLUS));
   if (g.rev4aSupport())
     eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_REV4a));
   eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_STOCK));
diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index edb779d72..60b173ae7 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -48,14 +48,15 @@ enum BoardEnum {
   BOARD_GRUVIN9X,
   BOARD_SKY9X,
   BOARD_TARANIS,
+  BOARD_TARANIS_PLUS,
   BOARD_TARANIS_REV4a
 };
 
 #define IS_9X(board)          (board==BOARD_STOCK || board==BOARD_M128)
 #define IS_STOCK(board)       (board==BOARD_STOCK)
 #define IS_2560(board)        (board==BOARD_GRUVIN9X || board==BOARD_MEGA2560)
-#define IS_ARM(board)         (board==BOARD_SKY9X || board==BOARD_TARANIS  || board==BOARD_TARANIS_REV4a)
-#define IS_TARANIS(board)     (board==BOARD_TARANIS  || board==BOARD_TARANIS_REV4a)
+#define IS_ARM(board)         (board==BOARD_SKY9X || board==BOARD_TARANIS  || board==BOARD_TARANIS_REV4a || board==BOARD_TARANIS_PLUS)
+#define IS_TARANIS(board)     (board==BOARD_TARANIS  || board==BOARD_TARANIS_REV4a || board==BOARD_TARANIS_PLUS)
 
 const uint8_t modn12x3[4][4]= {
   {1, 2, 3, 4},
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 13b7c86f5..c0dca9f26 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -65,6 +65,8 @@ const char * OpenTxEepromInterface::getName()
       return "OpenTX for Gruvin9x board / 9X";
     case BOARD_TARANIS:
       return "OpenTX for FrSky Taranis";
+    case BOARD_TARANIS_PLUS:
+      return "OpenTX for FrSky Taranis Plus";
     case BOARD_TARANIS_REV4a:
       return "OpenTX for FrSky Taranis Rev4a";
     case BOARD_SKY9X:
@@ -86,6 +88,7 @@ const int OpenTxEepromInterface::getEEpromSize()
     case BOARD_SKY9X:
       return EESIZE_SKY9X;
     case BOARD_TARANIS:
+    case BOARD_TARANIS_PLUS:
       return EESIZE_TARANIS;
     case BOARD_TARANIS_REV4a:
       return EESIZE_TARANIS_REV4a;
@@ -359,6 +362,7 @@ int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t
   if (!version) {
     switch(board) {
       case BOARD_TARANIS:
+      case BOARD_TARANIS_PLUS:
       case BOARD_TARANIS_REV4a:
       case BOARD_SKY9X:
         version = 216;
@@ -929,6 +933,7 @@ QString OpenTxFirmware::getFirmwareUrl(QString & id)
       break;
     case BOARD_SKY9X:
     case BOARD_TARANIS:
+    case BOARD_TARANIS_PLUS:
     case BOARD_TARANIS_REV4a:
       url.append(QString("/getfw.php?fw=%1.bin").arg(id));
       break;
@@ -955,6 +960,7 @@ QString OpenTxFirmware::getReleaseNotesUrl()
       url.append("9x.txt");
       break;
     case BOARD_TARANIS:
+    case BOARD_TARANIS_PLUS:
     case BOARD_TARANIS_REV4a:
       url.append("taranis.txt");
       break;
@@ -987,6 +993,7 @@ QString OpenTxFirmware::getStampUrl()
       url.append("sky9x.txt");
       break;
     case BOARD_TARANIS:
+    case BOARD_TARANIS_PLUS:
     case BOARD_TARANIS_REV4a:
       url.append("taranis.txt");
       break;
@@ -1009,6 +1016,7 @@ SimulatorInterface * OpenTxFirmware::getSimulator()
     case BOARD_SKY9X:
       return new Open9xSky9xSimulator();
     case BOARD_TARANIS:
+    case BOARD_TARANIS_PLUS:
     case BOARD_TARANIS_REV4a:
       return new OpentxTaranisSimulator();
     default:
@@ -1222,6 +1230,16 @@ void registerOpenTxFirmwares()
   openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
   openTx->addOptions(fai_options);
   firmwares.push_back(openTx);
+  
+  /* Taranis Plus board */
+  openTx = new OpenTxFirmware("opentx-taranisplus", QObject::tr("OpenTX for FrSky Taranis Plus"), BOARD_TARANIS_PLUS, true);
+  openTx->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
+  openTx->addOption("notemplates", QObject::tr("Disable TEMPLATES menu"));
+  openTx->addOption("nogvars", QObject::tr("Disable Global variables"));
+  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
+  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
+  openTx->addOptions(fai_options);
+  firmwares.push_back(openTx);
 
   if (g.rev4aSupport()) {
     openTx = new OpenTxFirmware("opentx-taranisrev4a", QObject::tr("OpenTX for FrSky Taranis Rev4a"), BOARD_TARANIS_REV4a, true);