From 96bc4f7cdf23fb5ff642f1378c9ade89c5dad404 Mon Sep 17 00:00:00 2001 From: pascallanger Date: Sun, 22 Sep 2019 20:00:04 +0200 Subject: [PATCH] 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 102782c03..de95ed58d 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 03db0bf75..52dbb902d 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%