From 8ccc354a88d96d5c6ea4175632b0f6db19368884 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 10 May 2019 23:21:06 +0200
Subject: [PATCH] ACCESS started in Companion

---
 companion/src/firmwares/moduledata.cpp        | 10 +++++++---
 companion/src/firmwares/moduledata.h          |  4 ++++
 .../src/firmwares/opentx/opentxinterface.cpp  | 19 +++++++++++++------
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/companion/src/firmwares/moduledata.cpp b/companion/src/firmwares/moduledata.cpp
index cc1ccd285..6828ebe09 100644
--- a/companion/src/firmwares/moduledata.cpp
+++ b/companion/src/firmwares/moduledata.cpp
@@ -101,10 +101,14 @@ QString ModuleData::protocolToString(unsigned protocol)
     "LP45", "DSM2", "DSMX",
     "PPM16", "PPMsim",
     "FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT",
-    "Crossfire",
+    "TBS Crossfire",
     "DIY Multiprotocol Module",
-    "FrSky R9M Module",
-    "SBUS output at VBat"
+    "FrSky PXX R9M",
+    "SBUS output at VBat",
+    "FrSky ACCESS ISRM",
+    "FrSky ACCESS R9M",
+    "FrSky ACCESS R9M Lite",
+    "FrSky ACCESS R9M Lite Pro"
   };
 
   return CHECK_IN_ARRAY(strings, protocol);
diff --git a/companion/src/firmwares/moduledata.h b/companion/src/firmwares/moduledata.h
index e0ea74958..7d03d4bff 100644
--- a/companion/src/firmwares/moduledata.h
+++ b/companion/src/firmwares/moduledata.h
@@ -48,6 +48,10 @@ enum PulsesProtocol {
   PULSES_MULTIMODULE,
   PULSES_PXX_R9M,
   PULSES_SBUS,
+  PULSES_ACCESS_ISRM,
+  PULSES_ACCESS_R9M,
+  PULSES_ACCESS_R9M_LITE,
+  PULSES_ACCESS_R9M_LITE_PRO,
   PULSES_PROTOCOL_LAST
 };
 
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 39a270971..11f84fb07 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -751,26 +751,30 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
       case 0:
         switch (proto) {
           case PULSES_OFF:
+            return 1;
           case PULSES_PXX_XJT_X16:
           case PULSES_PXX_XJT_LR12:
-            return 1;
+            return (IS_TARANIS_XLITES(board) || IS_TARANIS_X3(board)) ? 0 : 1;
           case PULSES_PXX_XJT_D8:
-            return id.contains("eu") ? 0 : 1;
+            return (IS_TARANIS_XLITES(board) || IS_TARANIS_X3(board) || id.contains("eu")) ? 0 : 1;
           case PULSES_PPM:
             return id.contains("internalppm") ? 1 : 0;
+          case PULSES_ACCESS_ISRM:
+            return (IS_TARANIS_XLITES(board) || IS_TARANIS_X3(board)) ? 1 : 0;
           default:
             return 0;
         }
-        break;
+
       case 1:
         switch (proto) {
           case PULSES_OFF:
           case PULSES_PPM:
+            return 1;
           case PULSES_PXX_XJT_X16:
           case PULSES_PXX_XJT_D8:
           case PULSES_PXX_XJT_LR12:
+            return (IS_TARANIS_XLITES(board) || IS_TARANIS_X3(board)) ? 0 : 1;
           case PULSES_PXX_R9M:
-            //case PULSES_PXX_DJT:     // Unavailable for now
           case PULSES_LP45:
           case PULSES_DSM2:
           case PULSES_DSMX:
@@ -779,10 +783,13 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
             return 1;
           case PULSES_MULTIMODULE:
             return id.contains("multimodule") ? 1 : 0;
+          case PULSES_ACCESS_R9M_LITE:
+          case PULSES_ACCESS_R9M_LITE_PRO:
+            return (IS_TARANIS_XLITES(board) || IS_TARANIS_X3(board)) ? 1 : 0;
           default:
             return 0;
         }
-        break;
+
       case -1:
         switch (proto) {
           case PULSES_PPM:
@@ -790,7 +797,7 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
           default:
             return 0;
         }
-        break;
+
       default:
         return 0;
     }