From 4b3a77c538c57edd6f187a762a9c3a0ae3c36b47 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Thu, 3 Oct 2019 09:29:42 +0200
Subject: [PATCH] Add missing modules (#6879)

---
 companion/src/firmwares/moduledata.cpp             | 8 ++++----
 companion/src/firmwares/opentx/opentxinterface.cpp | 6 ++++--
 companion/src/modeledit/setup.cpp                  | 5 +----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/companion/src/firmwares/moduledata.cpp b/companion/src/firmwares/moduledata.cpp
index 50310c5d0..e09724b48 100644
--- a/companion/src/firmwares/moduledata.cpp
+++ b/companion/src/firmwares/moduledata.cpp
@@ -127,12 +127,12 @@ QString ModuleData::protocolToString(unsigned protocol)
     "FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT",
     "TBS Crossfire",
     "DIY Multiprotocol Module",
-    "FrSky PXX R9M",
-    "FrSky PXX R9M Lite",
-    "FrSky PXX R9M Lite Pro",
+    "FrSky R9M",
+    "FrSky R9M Lite",
+    "FrSky R9M Lite Pro",
     "SBUS output at VBat",
     "FrSky ACCESS ISRM", "FrSky ACCST ISRM D16",
-    "FrSky ACCESS R9M",
+    "FrSky ACCESS R9M 2019",
     "FrSky ACCESS R9M Lite",
     "FrSky ACCESS R9M Lite Pro",
     "FrSky XJT lite (D16)", "FrSky XJT lite (D8)", "FrSky XJT lite (LR12)"
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 3ba4f2a7a..d832d77dd 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -797,13 +797,15 @@ bool OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
           case PULSES_MULTIMODULE:
           case PULSES_CROSSFIRE:
             return true;
+          case PULSES_ACCESS_R9M:
+            return IS_TARANIS_XLITE(board) || IS_TARANIS_X9LITE(board) || board == BOARD_TARANIS_X9DP_2019 || board == BOARD_X10_EXPRESS || (IS_HORUS(board) && id.contains("internalaccess"));
+          case PULSES_PXX_R9M_LITE:
           case PULSES_ACCESS_R9M_LITE:
           case PULSES_ACCESS_R9M_LITE_PRO:
-            return (IS_TARANIS_XLITES(board) || IS_TARANIS_X9LITE(board));
           case PULSES_XJT_LITE_X16:
           case PULSES_XJT_LITE_D8:
           case PULSES_XJT_LITE_LR12:
-            return (IS_TARANIS_XLITES(board) || IS_TARANIS_X9LITE(board));
+            return (IS_TARANIS_XLITE(board) || IS_TARANIS_X9LITE(board));
           default:
             return false;
         }
diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index 4b12115fe..7aa27fad2 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -217,10 +217,7 @@ ModulePanel::ModulePanel(QWidget * parent, ModelData & model, ModuleData & modul
   // The protocols available on this board
   for (unsigned int i=0; i<PULSES_PROTOCOL_LAST; i++) {
     if (firmware->isAvailable((PulsesProtocol) i, moduleIdx)) {
-      if (IS_TARANIS_XLITE(firmware->getBoard()) && i == PULSES_PXX_R9M)  //TODO remove when mini are handled as a different module type
-        ui->protocol->addItem("FrSky R9M Mini", (QVariant) i);
-      else
-        ui->protocol->addItem(ModuleData::protocolToString(i), i);
+      ui->protocol->addItem(ModuleData::protocolToString(i), i);
       if (i == module.protocol)
         ui->protocol->setCurrentIndex(ui->protocol->count()-1);
     }