From 7b1edb58a41d8d8d1805b2cefd601201ec3c9415 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Thu, 19 Jun 2014 12:29:22 +0200
Subject: [PATCH] Fixes #1306

---
 companion/src/firmwares/opentx/opentxM128simulator.cpp | 2 ++
 companion/src/firmwares/opentx/opentxeeprom.cpp        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/companion/src/firmwares/opentx/opentxM128simulator.cpp b/companion/src/firmwares/opentx/opentxM128simulator.cpp
index b5ba97093..d92eae2b3 100644
--- a/companion/src/firmwares/opentx/opentxM128simulator.cpp
+++ b/companion/src/firmwares/opentx/opentxM128simulator.cpp
@@ -46,6 +46,8 @@
 #define GPS
 #define FAI_CHOICE
 #define FRSKY_STICKS
+#define DSM2
+#define DSM2_PPM
 
 #define EEPROM_VARIANT SIMU_M128_VARIANTS
 #define GAUGES
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 1ac4d84fc..d17afe577 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -2424,7 +2424,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
   if (IS_ARM(board))
     internalField.Append(new UnsignedField<3>(modelData.telemetryProtocol));
   else
-    internalField.Append(new ConversionField< SignedField<3> >(modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this protocol")));
+    internalField.Append(new ConversionField< UnsignedField<3> >((unsigned int &)modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this protocol")));
 
   internalField.Append(new BoolField<1>(modelData.thrTrim));