From a3927218a69c7c7c7c68682ea6b256fae607fabe Mon Sep 17 00:00:00 2001 From: pascallanger Date: Fri, 24 Feb 2017 20:22:28 +0100 Subject: [PATCH] Futaba middle value 1520 --- Multiprotocol/SFHSS_cc2500.ino | 10 +++++----- Multiprotocol/TX_Def.h | 12 ++++++------ Multiprotocol/_Config.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Multiprotocol/SFHSS_cc2500.ino b/Multiprotocol/SFHSS_cc2500.ino index 4c5a9ec..56aa6cd 100644 --- a/Multiprotocol/SFHSS_cc2500.ino +++ b/Multiprotocol/SFHSS_cc2500.ino @@ -150,16 +150,16 @@ static void __attribute__((unused)) SFHSS_build_data_packet() } */ -// Channel values are 12-bit values between 1000 and 2000, 1500 is the middle. +// Channel values are 12-bit values between 1020 and 2020, 1520 is the middle. // Futaba @140% is 2070...1520...970 // Values grow down and to the right. static void __attribute__((unused)) SFHSS_build_data_packet() { uint8_t ch_offset = phase == SFHSS_DATA1 ? 0 : 4; - uint16_t ch1 = convert_channel_16b_nolim(CH_AETR[ch_offset+0],2000,1000); - uint16_t ch2 = convert_channel_16b_nolim(CH_AETR[ch_offset+1],2000,1000); - uint16_t ch3 = convert_channel_16b_nolim(CH_AETR[ch_offset+2],2000,1000); - uint16_t ch4 = convert_channel_16b_nolim(CH_AETR[ch_offset+3],2000,1000); + uint16_t ch1 = convert_channel_16b_nolim(CH_AETR[ch_offset+0],2020,1020); + uint16_t ch2 = convert_channel_16b_nolim(CH_AETR[ch_offset+1],2020,1020); + uint16_t ch3 = convert_channel_16b_nolim(CH_AETR[ch_offset+2],2020,1020); + uint16_t ch4 = convert_channel_16b_nolim(CH_AETR[ch_offset+3],2020,1020); packet[0] = 0x81; // can be 80 or 81 for Orange, only 81 for XK packet[1] = rx_tx_addr[0]; diff --git a/Multiprotocol/TX_Def.h b/Multiprotocol/TX_Def.h index f59f34b..9f24195 100644 --- a/Multiprotocol/TX_Def.h +++ b/Multiprotocol/TX_Def.h @@ -10,8 +10,8 @@ #if defined(TX_DEVO7) #define PPM_MAX_100 1920 // 100% #define PPM_MIN_100 1120 // 100% - #define PPM_MAX_125 2100 // 125% - #define PPM_MIN_125 900 // 125% + #define PPM_MAX_125 2120 // 125% + #define PPM_MIN_125 920 // 125% #endif // SPEKTRUM PPM and channels @@ -24,10 +24,10 @@ // HISKY #if defined(TX_HISKY) - #define PPM_MAX_100 1900 // 100% - #define PPM_MIN_100 1100 // 100% - #define PPM_MAX_125 2000 // 125% - #define PPM_MIN_125 1000 // 125% + #define PPM_MAX_100 1920 // 100% + #define PPM_MIN_100 1120 // 100% + #define PPM_MAX_125 2020 // 125% + #define PPM_MIN_125 1020 // 125% #endif // Multiplex MC2020 diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index 38fb10a..11ddbad 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -175,7 +175,7 @@ #define TX_ER9X //ER9X/ERSKY9X/OpenTX ( 988<->2012µs) //#define TX_DEVO7 //DEVO (1120<->1920µs) //#define TX_SPEKTRUM //Spektrum (1100<->1900µs) -//#define TX_HISKY //HISKY (1100<->1900µs) +//#define TX_HISKY //HISKY (1120<->1920µs) //#define TX_MPX //Multiplex MC2020 (1250<->1950µs) //#define TX_CUSTOM //Custom