gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-07-13 02:07:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'common_master' into protocol_rx_d16_autotune

Browse Source
This commit is contained in:
Goebish 2019-09-23 00:02:53 +02:00
commit 824ecd4eae
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -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; } - 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; } - 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 # Arduino IDE adds a lot of noise caused by network traffic; firewall it
- sudo iptables -P INPUT DROP - sudo iptables -P INPUT DROP

8
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 2 #define VERSION_MINOR 2
#define VERSION_REVISION 1 #define VERSION_REVISION 1
#define VERSION_PATCH_LEVEL 80 #define VERSION_PATCH_LEVEL 81
//****************** //******************
// Protocols // Protocols
@ -405,8 +405,8 @@ enum MultiPacketTypes
#define IS_WAIT_BIND_off ( ( protocol_flags2 & _BV(7) ) ==0 ) #define IS_WAIT_BIND_off ( ( protocol_flags2 & _BV(7) ) ==0 )
// Failsafe // Failsafe
#define FAILSAFE_CHANNEL_HOLD 0 #define FAILSAFE_CHANNEL_HOLD 2047
#define FAILSAFE_CHANNEL_NOPULSES 2047 #define FAILSAFE_CHANNEL_NOPULSES 0
//******************** //********************
//** Debug messages ** //** Debug messages **
@ -806,7 +806,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p --
2047 +125% 2047 +125%
Values are concatenated to fit in 22 bytes like in SBUS protocol. 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 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 Multimodule Status

2
Multiprotocol/Multiprotocol.ino
View File

@ -1473,7 +1473,7 @@ void update_serial_data()
uint16_t temp=((*((uint32_t *)p))>>dec)&0x7FF; uint16_t temp=((*((uint32_t *)p))>>dec)&0x7FF;
#ifdef FAILSAFE_ENABLE #ifdef FAILSAFE_ENABLE
if(failsafe) 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 else
#endif #endif
Channel_data[i]=temp; //value range 0..2047, 0=-125%, 2047=+125% Channel_data[i]=temp; //value range 0..2047, 0=-125%, 2047=+125%