From 374b46966c91832e1b083af3fa8a2869c1190dff Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Fri, 5 Jun 2020 22:22:13 +0200 Subject: [PATCH] FrSkyX: small change --- Multiprotocol/FrSkyDVX_common.ino | 10 +++++++--- Multiprotocol/FrSkyX_cc2500.ino | 4 +--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Multiprotocol/FrSkyDVX_common.ino b/Multiprotocol/FrSkyDVX_common.ino index 17a8b3b..f4c3234 100644 --- a/Multiprotocol/FrSkyDVX_common.ino +++ b/Multiprotocol/FrSkyDVX_common.ino @@ -69,14 +69,18 @@ static void __attribute__((unused)) FrSkyX_channels(uint8_t offset) FAILSAFE_VALUES_off; } failsafe_count++; - packet[7] = FS_flag; + if(protocol==PROTO_FRSKY_R9) + failsafe_count++; // R9 is 20ms, X is 9ms + packet[offset] = FS_flag; #else - packet[7] = 0; + packet[offset] = 0; #endif // + packet[offset+1] = 0; //?? + // uint8_t chan_index = chan_start; uint16_t ch1,ch2; - for(uint8_t i = offset; i < 12+offset ; i+=3) + for(uint8_t i = offset+2; i < 12+offset+2 ; i+=3) {//12 bytes of channel data #ifdef FAILSAFE_ENABLE if( (FS_flag & 0x10) && ((failsafe_chan & 0x07) == (chan_index & 0x07)) ) diff --git a/Multiprotocol/FrSkyX_cc2500.ino b/Multiprotocol/FrSkyX_cc2500.ino index e55b0fd..5fc0057 100644 --- a/Multiprotocol/FrSkyX_cc2500.ino +++ b/Multiprotocol/FrSkyX_cc2500.ino @@ -98,9 +98,7 @@ static void __attribute__((unused)) FrSkyX_build_packet() packet[5] = FrSkyX_chanskip>>2; packet[6] = RX_num; - packet[8] = 0; //?? - - FrSkyX_channels(9); // Set packet[7] and packet[9..20] with channels data and failsafe + FrSkyX_channels(7); // Set packet[7]=failsafe, packet[8]=0?? and packet[9..20]=channels data //sequence and send SPort for (uint8_t i=22;i