diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index aba9061c6..6f9aa3f87 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -25,7 +25,7 @@
 #define MAX_CUSTOM_FUNCTIONS(board, version) (IS_ARM(board) ? (version >= 216 ? 64 : 32) : (IS_DBLEEPROM(board, version) ? 24 : 16))
 #define MAX_CURVES(board, version)           (IS_ARM(board) ? ((IS_TARANIS(board) && version >= 216) ? 32 : 16) : 8)
 #define MAX_GVARS(board, version)            ((IS_ARM(board) && version >= 216) ? 9 : 5)
-#define MAX_SENSORS(board, version)          (IS_TARANIS(board) ? 32 : 16)
+#define MAX_SENSORS(board, version)          (32)
 #define NUM_PPM_INPUTS(board, version)       ((IS_ARM(board) && version >= 216) ? 16 : 8)
 
 #define IS_AFTER_RELEASE_21_MARCH_2013(board, version) (version >= 214 || (!IS_ARM(board) && version >= 213))
@@ -2960,9 +2960,17 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
       internalField.Append(new UnsignedField<8>(modelData.trainerMode));
     }
   }
-  else if (IS_ARM(board) && version >= 216) {
-    modulesCount = 3;
-    internalField.Append(new ConversionField< SignedField<8> >(modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this radio protocol")));
+  else if (IS_ARM(board)) {
+    if (version >= 217) {
+      modulesCount = 3;
+      internalField.Append(new ConversionField< SignedField<3> >(modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this radio protocol")));
+      internalField.Append(new SpareBitsField<3>());
+      internalField.Append(new UnsignedField<2>(modelData.potsWarningMode));
+    }
+    else if (version >= 216) {
+      modulesCount = 3;
+      internalField.Append(new ConversionField< SignedField<8> >(modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this radio protocol")));
+    }
   }
 
   if (IS_ARM(board) && version >= 215) {
@@ -3042,6 +3050,11 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
     internalField.Append(new SpareBitsField<16>());
   }
 
+  if (IS_SKY9X(board) && version >= 217) {
+    internalField.Append(new SpareBitsField<8>());
+    internalField.Append(new SpareBitsField<8>());
+  }
+
   if (IS_ARM(board) && version >= 217) {
     for (int i=0; i<MAX_SENSORS(board, version); ++i) {
       internalField.Append(new SensorField(modelData.sensorData[i], board, version));
diff --git a/companion/src/firmwares/opentx/simulator/CMakeLists.txt b/companion/src/firmwares/opentx/simulator/CMakeLists.txt
index 2505f3bef..a36bf02f3 100644
--- a/companion/src/firmwares/opentx/simulator/CMakeLists.txt
+++ b/companion/src/firmwares/opentx/simulator/CMakeLists.txt
@@ -72,6 +72,7 @@ add_library(opentx-9xr128${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-gruvin9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-mega2560${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-sky9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
+add_library(opentx-9xrpro${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-taranis${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-taranisplus${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-taranisx9e${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
@@ -83,6 +84,7 @@ add_dependencies(opentx-9xr128${SUFFIX}-simulator about_lbm_9x trans)
 add_dependencies(opentx-gruvin9x${SUFFIX}-simulator about_lbm_9x trans)
 add_dependencies(opentx-mega2560${SUFFIX}-simulator about_lbm_9x trans)
 add_dependencies(opentx-sky9x${SUFFIX}-simulator about_lbm_9x trans)
+add_dependencies(opentx-9xrpro${SUFFIX}-simulator about_lbm_9x trans)
 add_dependencies(opentx-taranis${SUFFIX}-simulator about_lbm_taranis trans lua_exports)
 add_dependencies(opentx-taranisplus${SUFFIX}-simulator about_lbm_taranis trans lua_exports)
 add_dependencies(opentx-taranisx9e${SUFFIX}-simulator about_lbm_taranis trans lua_exports)
@@ -95,6 +97,7 @@ set(OPENTX_LIBRARIES
   opentx-gruvin9x${SUFFIX}-simulator
   opentx-mega2560${SUFFIX}-simulator
   opentx-sky9x${SUFFIX}-simulator
+  opentx-9xrpro${SUFFIX}-simulator
   opentx-taranis${SUFFIX}-simulator
   opentx-taranisplus${SUFFIX}-simulator
   opentx-taranisx9e${SUFFIX}-simulator
@@ -135,6 +138,11 @@ target_include_directories(opentx-sky9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_D
 target_compile_definitions(opentx-sky9x${SUFFIX}-simulator PRIVATE PCBSKY9X CPUARM VOICE SDCARD ${COMMON_DEFINITIONS})
 target_link_libraries(opentx-sky9x${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
 
+# 9XR-PRO
+target_include_directories(opentx-9xrpro${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/sky9x)
+target_compile_definitions(opentx-9xrpro${SUFFIX}-simulator PRIVATE PCBSKY9X REVX CPUARM VOICE SDCARD ${COMMON_DEFINITIONS})
+target_link_libraries(opentx-9xrpro${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
+
 # Taranis standard
 target_include_directories(opentx-taranis${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/taranis)
 target_compile_definitions(opentx-taranis${SUFFIX}-simulator PRIVATE PCBTARANIS CPUARM CPUSTM32 VOICE SDCARD ${COMMON_DEFINITIONS})
diff --git a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
index ffdb1755b..7012e11f6 100644
--- a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
+++ b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
@@ -59,7 +59,7 @@
 #define TIMERS 2
 #endif
 
-#if defined(PCBSKY9X)
+#if defined(PCBSKY9X) && !defined(REVX)
 #define ROTARY_ENCODERS 1
 #elif defined(PCBGRUVIN9X)
 #define ROTARY_ENCODERS 2
@@ -362,7 +362,7 @@ bool OpenTxSimulator::lcdChanged(bool & lightEnable)
 
 void OpenTxSimulator::start(QByteArray & eeprom, bool tests)
 {
-#if defined(PCBSKY9X)
+#if defined(PCBSKY9X) && !defined(REVX)
   g_rotenc[0] = 0;
 #elif defined(PCBGRUVIN9X)
   g_rotenc[0] = 0;
@@ -376,7 +376,7 @@ void OpenTxSimulator::start(QByteArray & eeprom, bool tests)
 
 void OpenTxSimulator::start(const char * filename, bool tests)
 {
-#if defined(PCBSKY9X)
+#if defined(PCBSKY9X) && !defined(REVX)
   g_rotenc[0] = 0;
 #elif defined(PCBGRUVIN9X)
   g_rotenc[0] = 0;
@@ -445,7 +445,7 @@ void OpenTxSimulator::wheelEvent(int steps)
     x9de_rotenc -= 2;
   else
     x9de_rotenc += 2;
-#elif defined(PCBSKY9X)
+#elif defined(PCBSKY9X) && !defined(REVX)
   g_rotenc[0] += steps*4;
 #elif defined(PCBGRUVIN9X)
   g_rotenc[0] += steps;
diff --git a/companion/src/firmwares/opentx/simulator/opentxsimulator.h b/companion/src/firmwares/opentx/simulator/opentxsimulator.h
index 4d34329f7..1e2b1470a 100644
--- a/companion/src/firmwares/opentx/simulator/opentxsimulator.h
+++ b/companion/src/firmwares/opentx/simulator/opentxsimulator.h
@@ -31,6 +31,10 @@
   #define FLAVOUR "taranis"
   #define NAMESPACE Taranis
   #define EEPROM_VARIANT 0
+#elif defined(PCBSKY9X) && defined(REVX)
+  #define FLAVOUR "9xrpro"
+  #define NAMESPACE Sky9xPro
+  #define EEPROM_VARIANT 0
 #elif defined(PCBSKY9X)
   #define FLAVOUR "sky9x"
   #define NAMESPACE Sky9X