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 diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 87f6f0f..a3e2614 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%