From a58b129503736a7064b82dd748dab21763b4f20e Mon Sep 17 00:00:00 2001
From: pascallanger <planger@mathworks.com>
Date: Tue, 19 Apr 2016 14:29:47 +0200
Subject: [PATCH] Orange module TAER order and Devo option

---
 Multiprotocol/Multiprotocol.cpp.xmega |  1 +
 Multiprotocol/_Config.h               | 28 +++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/Multiprotocol/Multiprotocol.cpp.xmega b/Multiprotocol/Multiprotocol.cpp.xmega
index 87ebf73..46967a0 100644
--- a/Multiprotocol/Multiprotocol.cpp.xmega
+++ b/Multiprotocol/Multiprotocol.cpp.xmega
@@ -460,6 +460,7 @@ void NRF24L01_Reset()
 
 #include "cyrf6936_SPI.ino"
 #include "DSM2_cyrf6936.ino"
+#include "Devo_cyrf6936.ino"
 
 #include "Telemetry.ino"
 
diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h
index c0942e4..e6d3394 100644
--- a/Multiprotocol/_Config.h
+++ b/Multiprotocol/_Config.h
@@ -16,7 +16,8 @@
 /** Multiprotocol module configuration file ***/
 
 //Uncomment your TX type
-#define TX_ER9X			//ER9X AETR (988<->2012µs)
+#define TX_ER9X_AETR	//ER9X AETR (988<->2012µs)
+//#define TX_ER9X_TAER	//ER9X TAER (988<->2012µs)
 //#define TX_DEVO7		//DEVO7 EATR (1120<->1920µs)
 //#define TX_SPEKTRUM	//Spektrum TAER (1100<->1900µs)
 //#define TX_HISKY		//HISKY AETR (1100<->1900µs)
@@ -176,7 +177,7 @@ Option		value between 0 and 255. 0xD7 or 0x00 for Frsky fine tuning.
 //TX definitions with timing endpoints and channels order
 
 // Turnigy PPM and channels
-#if defined(TX_ER9X)
+#if defined(TX_ER9X_AETR)
 #define PPM_MAX		2140	//	125%
 #define PPM_MIN		860		//	125%
 #define PPM_MAX_100 2012	//	100%
@@ -198,6 +199,29 @@ enum chan_order{
 };
 #endif
 
+// Turnigy PPM and channels
+#if defined(TX_ER9X_TAER)
+#define PPM_MAX		2140	//	125%
+#define PPM_MIN		860		//	125%
+#define PPM_MAX_100 2012	//	100%
+#define PPM_MIN_100 988		//	100%
+enum chan_order{
+	THROTTLE =0,
+	AILERON,
+	ELEVATOR,
+	RUDDER,
+	AUX1,
+	AUX2,
+	AUX3,
+	AUX4,
+	AUX5,
+	AUX6,
+	AUX7,
+	AUX8,
+	AUX9
+};
+#endif
+
 // Devo PPM and channels
 #if defined(TX_DEVO7)
 #define PPM_MAX		2100	//	125%