From cd235bbcde503603a23bbf6b719a04f3cc36c28f Mon Sep 17 00:00:00 2001
From: Pascal Langer <planger@mathworks.com>
Date: Tue, 9 Jan 2018 09:04:55 +0100
Subject: [PATCH] Removed PPM 125% statements

---
 Multiprotocol/Multiprotocol.h |  2 +-
 Multiprotocol/TX_Def.h        | 12 ------------
 Multiprotocol/Validate.h      |  4 ++--
 Multiprotocol/_Config.h       |  8 +++-----
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index 72daf74..a563b91 100644
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		2
 #define VERSION_REVISION	0
-#define VERSION_PATCH_LEVEL	7
+#define VERSION_PATCH_LEVEL	8
 //******************
 // Protocols
 //******************
diff --git a/Multiprotocol/TX_Def.h b/Multiprotocol/TX_Def.h
index 2a342c6..e122af4 100644
--- a/Multiprotocol/TX_Def.h
+++ b/Multiprotocol/TX_Def.h
@@ -2,48 +2,36 @@
 #if defined(TX_ER9X)
 	#define PPM_MAX_100 2012	//	100%
 	#define PPM_MIN_100 988		//	100%
-	#define PPM_MAX_125	2140	//	125%
-	#define PPM_MIN_125	860		//	125%
 #endif
 
 // Devo PPM and channels
 #if defined(TX_DEVO7)
 	#define PPM_MAX_100	1920	//	100%
 	#define PPM_MIN_100	1120	//	100%
-	#define PPM_MAX_125	2120	//	125%
-	#define PPM_MIN_125	920		//	125%
 #endif
 
 // SPEKTRUM PPM and channels
 #if defined(TX_SPEKTRUM)
 	#define PPM_MAX_100	1900	//	100%
 	#define PPM_MIN_100	1100	//	100%
-	#define PPM_MAX_125	2000	//	125%
-	#define PPM_MIN_125	1000	//	125%
 #endif
 
 // HISKY
 #if defined(TX_HISKY)
 	#define PPM_MAX_100	1920	//	100%
 	#define PPM_MIN_100	1120	//	100%
-	#define PPM_MAX_125	2020	//	125%
-	#define PPM_MIN_125	1020	//	125%
 #endif
 
 // Multiplex MC2020
 #if defined(TX_MPX)
 	#define PPM_MAX_100 1950 // 100%
 	#define PPM_MIN_100 1250 // 100%
-	#define PPM_MAX_125 2050 // 125%
-	#define PPM_MIN_125 1150 // 125%
 #endif
 
 // Walkera PL0811-01H
 #if defined(TX_WALKERA)
 	#define PPM_MAX_100 1800 // 100%
 	#define PPM_MIN_100 1000 // 100%
-	#define PPM_MAX_125 1900 // 125%
-	#define PPM_MIN_125 900  // 125%
 #endif
 
 //Channel MIN MAX values
diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h
index 87afd5d..7a02e82 100644
--- a/Multiprotocol/Validate.h
+++ b/Multiprotocol/Validate.h
@@ -225,8 +225,8 @@
 #ifndef AILERON
 	#error You must select a correct channel order.
 #endif
-#if not defined(PPM_MAX_100) || not defined(PPM_MIN_100) || not defined(PPM_MAX_125) || not defined(PPM_MIN_125)
-	#error You must set correct TX end points.
+#if not defined(PPM_MAX_100) || not defined(PPM_MIN_100)
+	#error You must set correct PPM end points for your TX.
 #endif
 
 #if defined(ENABLE_BIND_CH)
diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h
index 2dfdf5e..a6d44ae 100644
--- a/Multiprotocol/_Config.h
+++ b/Multiprotocol/_Config.h
@@ -284,13 +284,11 @@
 // A few things to consider:
 //  - If you put too big values compared to your TX you won't be able to reach the extremes which is bad for throttle as an example
 //  - If you put too low values you won't be able to use your full stick range, it will be maxed out before reaching the ends
-//  - Centered stick value is usually 1500. It should match the middle between MIN and MAX, ie Center=(MAX-MIN)/2+MIN. If your TX is not centered you can adjust the value MIN or MAX.
-//  - 100% is the value when the model is by default, 125% is the value when you extend the servo travel which is only used by some protocols
+//  - Centered stick value is usually 1500. It should match the middle between MIN and MAX, ie Center=(MAX+MIN)/2. If your TX is not centered you can adjust the value MIN or MAX.
+//  - 100% is referred as the value when the TX is set to default with no trims
 #if defined(TX_CUSTOM)
 	#define PPM_MAX_100	1900	//	100%
 	#define PPM_MIN_100	1100	//	100%
-	#define PPM_MAX_125	2000	//	125%
-	#define PPM_MIN_125	1000	//	125%
 #endif
 
 /** Number of PPM Channels **/
@@ -462,7 +460,7 @@ const PPM_Parameters PPM_prot[15]=	{
 		COR_V2
 */
 
-// RX_Num is used for model match. Using RX_Num	values different for each receiver will prevent starting a model with the false config loaded...
+// RX_Num is used for TX & RX match. Using different RX_Num values for each receiver will prevent starting a model with the false config loaded...
 // RX_Num value is between 0 and 15.
 
 // Power P_HIGH or P_LOW: High or low power setting for the transmission.