From f9d240455cab2dd61b6a836ad390b05ac0e0fe5d Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Tue, 4 Jun 2019 16:00:20 +0200
Subject: [PATCH] ACCESS module type added to Companion

---
 companion/src/firmwares/moduledata.h          |  1 +
 companion/src/firmwares/opentx/opentxeeprom.h | 53 ++++++++-----------
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/companion/src/firmwares/moduledata.h b/companion/src/firmwares/moduledata.h
index b3e3bf697..06f48f144 100644
--- a/companion/src/firmwares/moduledata.h
+++ b/companion/src/firmwares/moduledata.h
@@ -47,6 +47,7 @@ enum PulsesProtocol {
   PULSES_CROSSFIRE,
   PULSES_MULTIMODULE,
   PULSES_PXX_R9M,
+  PULSES_PXX_R9M_LITE,
   PULSES_SBUS,
   PULSES_ACCESS_ISRM,
   PULSES_ACCESS_R9M,
diff --git a/companion/src/firmwares/opentx/opentxeeprom.h b/companion/src/firmwares/opentx/opentxeeprom.h
index 14639d330..19c1f7318 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.h
+++ b/companion/src/firmwares/opentx/opentxeeprom.h
@@ -76,38 +76,29 @@ class ProtocolsConversionTable: public ConversionTable
     ProtocolsConversionTable(Board::Type board)
     {
       int val = 0;
-      if (IS_ARM(board)) {
-        addConversion(PULSES_OFF, val++);
-      }
+      addConversion(PULSES_OFF, val++);
       addConversion(PULSES_PPM, val++);
-      if (!IS_ARM(board)) {
-        addConversion(PULSES_PPM16, val++);
-        addConversion(PULSES_PPMSIM, val++);
-      }
-      if (IS_ARM(board)) {
-        addConversion(PULSES_PXX_XJT_X16, val);
-        addConversion(PULSES_PXX_XJT_D8, val);
-        addConversion(PULSES_PXX_XJT_LR12, val++);
-      }
-      else {
-        addConversion(PULSES_PXX_DJT, val++);
-      }
-      if (IS_ARM(board)) {
-        addConversion(PULSES_LP45, val);
-        addConversion(PULSES_DSM2, val);
-        addConversion(PULSES_DSMX, val++);
-      }
-      else {
-        addConversion(PULSES_LP45, val++);
-        addConversion(PULSES_DSM2, val++);
-        addConversion(PULSES_DSMX, val++);
-      }
-      if (IS_ARM(board)) {
-        addConversion(PULSES_CROSSFIRE, val++);
-        addConversion(PULSES_MULTIMODULE, val++);
-        addConversion(PULSES_PXX_R9M, val++);
-        addConversion(PULSES_SBUS, val++);
-      }
+
+      addConversion(PULSES_PXX_XJT_X16, val);
+      addConversion(PULSES_PXX_XJT_D8, val);
+      addConversion(PULSES_PXX_XJT_LR12, val++);
+
+      addConversion(PULSES_ACCESS_ISRM, val++);
+
+      addConversion(PULSES_LP45, val);
+      addConversion(PULSES_DSM2, val);
+      addConversion(PULSES_DSMX, val++);
+
+      addConversion(PULSES_CROSSFIRE, val++);
+      addConversion(PULSES_MULTIMODULE, val++);
+
+      addConversion(PULSES_PXX_R9M, val++);
+      addConversion(PULSES_ACCESS_R9M, val++);
+      addConversion(PULSES_PXX_R9M_LITE, val++);
+      addConversion(PULSES_ACCESS_R9M_LITE, val++);
+      addConversion(PULSES_ACCESS_R9M_LITE_PRO, val++);
+
+      addConversion(PULSES_SBUS, val++);
     }
 };