Revert Fix FrskyX failsafe hold/no pulse inversion

This commit is contained in:
pascallanger 2019-09-22 20:00:04 +02:00
parent 6503469ddd
commit 96bc4f7cdf
2 changed files with 5 additions and 5 deletions

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

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%