From 96bc4f7cdf23fb5ff642f1378c9ade89c5dad404 Mon Sep 17 00:00:00 2001
From: pascallanger <pascal_langer@yahoo.fr>
Date: Sun, 22 Sep 2019 20:00:04 +0200
Subject: [PATCH 1/2] Revert Fix FrskyX failsafe hold/no pulse inversion

---
 Multiprotocol/Multiprotocol.h   | 8 ++++----
 Multiprotocol/Multiprotocol.ino | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index 102782c..de95ed5 100644
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		2
 #define VERSION_REVISION	1
-#define VERSION_PATCH_LEVEL	80
+#define VERSION_PATCH_LEVEL	81
 
 //******************
 // Protocols
@@ -405,8 +405,8 @@ enum MultiPacketTypes
 #define IS_WAIT_BIND_off	( ( protocol_flags2 & _BV(7) ) ==0 )
 
 // Failsafe
-#define FAILSAFE_CHANNEL_HOLD		0
-#define	FAILSAFE_CHANNEL_NOPULSES	2047
+#define FAILSAFE_CHANNEL_HOLD		2047
+#define	FAILSAFE_CHANNEL_NOPULSES	0
 
 //********************
 //** Debug messages **
@@ -806,7 +806,7 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
 	2047	+125%
    Values are concatenated to fit in 22 bytes like in SBUS protocol.
    Failsafe values have exactly the same range/values than normal channels except the extremes where
-      0=hold, 2047=no pulse. If failsafe is not set or RX then failsafe packets should not be sent.
+      0=no pulse, 2047=hold. If failsafe is not set or RX then failsafe packets should not be sent.
 */
 /*
   Multimodule Status
diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino
index 03db0bf..52dbb90 100644
--- a/Multiprotocol/Multiprotocol.ino
+++ b/Multiprotocol/Multiprotocol.ino
@@ -1473,7 +1473,7 @@ void update_serial_data()
 		uint16_t temp=((*((uint32_t *)p))>>dec)&0x7FF;
 		#ifdef FAILSAFE_ENABLE
 			if(failsafe)
-				Failsafe_data[i]=temp;			//value range 0..2047, 0=hold, 2047=no pulses
+				Failsafe_data[i]=temp;			//value range 0..2047, 0=no pulse, 2047=hold
 			else
 		#endif
 				Channel_data[i]=temp;			//value range 0..2047, 0=-125%, 2047=+125%

From bed02c9384fb871b086291f131e85381c78aa5ec Mon Sep 17 00:00:00 2001
From: Ben Lye <ben@lye.co.nz>
Date: Sun, 22 Sep 2019 14:17:23 -0400
Subject: [PATCH 2/2] Update .travis.yml (#269)

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b66bdb1..4a5a23d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ before_install:
   #
   - buildMulti() { exitcode=0; BUILDCMD="arduino --verify --board $BOARD Multiprotocol/Multiprotocol.ino --pref build.path=./build/"; echo $BUILDCMD; $BUILDCMD; if [ $? -ne 0 ]; then exitcode=1; fi; echo; return $exitcode; }
   - buildProtocol() { exitcode=0; opt_disable $ALL_PROTOCOLS; opt_enable $1; buildMulti; if [ $? -ne 0 ]; then exitcode=1; fi; return $exitcode; }
-  - buildEachProtocol() { exitcode=0; for PROTOCOL in $ALL_PROTOCOLS ; do echo Building $PROTOCOL; buildProtocol $PROTOCOL; if [ $? -ne 0 ]; then exitcode=1; fi; done; return $exitcode; }
+  - buildEachProtocol() { exitcodesum=0; for PROTOCOL in $ALL_PROTOCOLS ; do echo Building $PROTOCOL; buildProtocol $PROTOCOL; if [ $? -ne 0 ]; then exitcodesum=$((exitcodesum + 1)); fi; done; return $exitcodesum; }
   #
   # Arduino IDE adds a lot of noise caused by network traffic; firewall it
   - sudo iptables -P INPUT DROP