diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 129bd57c5..d16661764 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -841,6 +841,7 @@ enum PulsesProtocol {
   PULSES_PXX_XJT_D8,
   PULSES_PXX_XJT_LR12,
   PULSES_PXX_DJT,
+  PULSES_CROSSFIRE,
   PULSES_PROTOCOL_LAST
 };
 
diff --git a/companion/src/firmwares/opentx/opentxeeprom.h b/companion/src/firmwares/opentx/opentxeeprom.h
index 1664bae77..973704fb6 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.h
+++ b/companion/src/firmwares/opentx/opentxeeprom.h
@@ -81,6 +81,9 @@ class ProtocolsConversionTable: public ConversionTable
         addConversion(PULSES_DSM2, val++);
         addConversion(PULSES_DSMX, val++);
       }
+      if (IS_TARANIS(board)) {
+    	addConversion(PULSES_CROSSFIRE, val++);
+      }
     }
 };
 
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 05aa388f1..59536cf51 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -853,6 +853,7 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
           case PULSES_LP45:
           case PULSES_DSM2:
           case PULSES_DSMX:
+          case PULSES_CROSSFIRE:
             return 1;
           default:
             return 0;
diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index ee5ce7715..ccfd16a37 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -6,7 +6,7 @@
 #include "appdata.h"
 #include "modelprinter.h"
 
-TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, Firmware * firmware, QWidget *prevFocus):
+TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, Firmware * firmware, QWidget * prevFocus):
   ModelPanel(parent, model, generalSettings, firmware),
   timer(timer),
   ui(new Ui::Timer)
@@ -247,6 +247,10 @@ void ModulePanel::update()
         module.channelsCount = 6;
         max_rx_num = 20;
         break;
+      case PULSES_CROSSFIRE:
+        mask |= MASK_CHANNELS_RANGE;
+        module.channelsCount = 12;
+        break;
       case PULSES_PPM:
         mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE| MASK_CHANNELS_COUNT;
         if (IS_9XRPRO(firmware->getBoard())) {
diff --git a/companion/src/modelprinter.cpp b/companion/src/modelprinter.cpp
index 31d73dbdb..0817a85d6 100644
--- a/companion/src/modelprinter.cpp
+++ b/companion/src/modelprinter.cpp
@@ -90,13 +90,15 @@ QString ModelPrinter::printThrottleTrimMode()
 
 QString ModelPrinter::printModuleProtocol(unsigned int protocol)
 {
-  static const char *strings[] = { "OFF",
-                                   "PPM",
-                                   "Silverlit A", "Silverlit B", "Silverlit C",
-                                   "CTP1009",
-                                   "LP45", "DSM2", "DSMX",
-                                   "PPM16", "PPMsim",
-                                   "FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT",
+  static const char * strings[] = {
+      "OFF",
+	  "PPM",
+	  "Silverlit A", "Silverlit B", "Silverlit C",
+	  "CTP1009",
+	  "LP45", "DSM2", "DSMX",
+	  "PPM16", "PPMsim",
+	  "FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT",
+	  "Crossfire"
   };
 
   return CHECK_IN_ARRAY(strings, protocol);