From 2f64f1f84aaa872a9b8338026ad50a3245766553 Mon Sep 17 00:00:00 2001 From: Goebish Date: Sat, 12 Oct 2019 00:21:07 +0200 Subject: [PATCH] Rename FrSkyX Rx to FrSky Rx --- Multiprotocol/FrSkyDVX_common.ino | 2 +- ...SkyX_Rx_cc2500.ino => FrSky_Rx_cc2500.ino} | 162 +++++++++--------- Multiprotocol/Multiprotocol.h | 8 +- Multiprotocol/Multiprotocol.ino | 10 +- Multiprotocol/Telemetry.ino | 6 +- Multiprotocol/Validate.h | 14 +- Multiprotocol/_Config.h | 6 +- 7 files changed, 104 insertions(+), 104 deletions(-) rename Multiprotocol/{FrSkyX_Rx_cc2500.ino => FrSky_Rx_cc2500.ino} (72%) diff --git a/Multiprotocol/FrSkyDVX_common.ino b/Multiprotocol/FrSkyDVX_common.ino index 8f257ed..801b6e9 100644 --- a/Multiprotocol/FrSkyDVX_common.ino +++ b/Multiprotocol/FrSkyDVX_common.ino @@ -17,7 +17,7 @@ /** FrSky D and X routines **/ /******************************/ -#if defined(FRSKYX_CC2500_INO) || defined(FRSKYX_RX_CC2500_INO) +#if defined(FRSKYX_CC2500_INO) || defined(FRSKY_RX_CC2500_INO) //**CRC** const uint16_t PROGMEM FrSkyX_CRC_Short[]={ 0x0000, 0x1189, 0x2312, 0x329B, 0x4624, 0x57AD, 0x6536, 0x74BF, diff --git a/Multiprotocol/FrSkyX_Rx_cc2500.ino b/Multiprotocol/FrSky_Rx_cc2500.ino similarity index 72% rename from Multiprotocol/FrSkyX_Rx_cc2500.ino rename to Multiprotocol/FrSky_Rx_cc2500.ino index a14f490..d5b7b72 100644 --- a/Multiprotocol/FrSkyX_Rx_cc2500.ino +++ b/Multiprotocol/FrSky_Rx_cc2500.ino @@ -13,7 +13,7 @@ along with Multiprotocol. If not, see . */ -#if defined(FRSKYX_RX_CC2500_INO) +#if defined(FRSKY_RX_CC2500_INO) #include "iface_cc2500.h" @@ -21,26 +21,26 @@ #define FRSKYX_LBT_LENGTH (33+2) enum { - FRSKYX_RX_TUNE_START, - FRSKYX_RX_TUNE_LOW, - FRSKYX_RX_TUNE_HIGH, - FRSKYX_RX_BIND, - FRSKYX_RX_DATA, + FRSKY_RX_TUNE_START, + FRSKY_RX_TUNE_LOW, + FRSKY_RX_TUNE_HIGH, + FRSKY_RX_BIND, + FRSKY_RX_DATA, }; - static uint8_t frskyx_rx_chanskip; - static uint8_t frskyx_rx_disable_lna; - static uint8_t frskyx_rx_data_started; - static int8_t frskyx_rx_finetune; + static uint8_t frsky_rx_chanskip; + static uint8_t frsky_rx_disable_lna; + static uint8_t frsky_rx_data_started; + static int8_t frsky_rx_finetune; -static void __attribute__((unused)) frskyx_rx_strobe_rx() +static void __attribute__((unused)) frsky_rx_strobe_rx() { CC2500_Strobe(CC2500_SIDLE); CC2500_Strobe(CC2500_SFRX); CC2500_Strobe(CC2500_SRX); } -static void __attribute__((unused)) FrSkyX_Rx_initialise() { +static void __attribute__((unused)) frsky_rx_initialise() { CC2500_Reset(); CC2500_WriteReg(CC2500_02_IOCFG0, 0x01); @@ -96,24 +96,24 @@ static void __attribute__((unused)) FrSkyX_Rx_initialise() { break; } - frskyx_rx_disable_lna = IS_POWER_FLAG_on; - CC2500_SetTxRxMode(frskyx_rx_disable_lna ? TXRX_OFF : RX_EN); // lna disable / enable + frsky_rx_disable_lna = IS_POWER_FLAG_on; + CC2500_SetTxRxMode(frsky_rx_disable_lna ? TXRX_OFF : RX_EN); // lna disable / enable - frskyx_rx_strobe_rx(); + frsky_rx_strobe_rx(); CC2500_WriteReg(CC2500_0A_CHANNR, 0); // bind channel delayMicroseconds(1000); // wait for RX to activate } -static void __attribute__((unused)) frskyx_rx_set_channel(uint8_t channel) +static void __attribute__((unused)) frsky_rx_set_channel(uint8_t channel) { CC2500_WriteReg(CC2500_0A_CHANNR, hopping_frequency[channel]); CC2500_WriteReg(CC2500_25_FSCAL1, calData[channel]); - frskyx_rx_strobe_rx(); + frsky_rx_strobe_rx(); } -static void __attribute__((unused)) frskyx_rx_calibrate() +static void __attribute__((unused)) frsky_rx_calibrate() { - frskyx_rx_strobe_rx(); + frsky_rx_strobe_rx(); for (unsigned c = 0; c < 47; c++) { CC2500_Strobe(CC2500_SIDLE); @@ -132,7 +132,7 @@ static uint8_t __attribute__((unused)) frskyx_rx_check_crc() return lcrc == rcrc; } -static void __attribute__((unused)) frskyx_rx_build_telemetry_packet() +static void __attribute__((unused)) frsky_rx_build_telemetry_packet() { static uint16_t frskyx_rx_rc_chan[16]; uint16_t pxx_channel[8]; @@ -176,42 +176,42 @@ static void __attribute__((unused)) frskyx_rx_build_telemetry_packet() } } -uint16_t initFrSkyX_Rx() +uint16_t initFrSky_Rx() { - FrSkyX_Rx_initialise(); + frsky_rx_initialise(); state = 0; - frskyx_rx_chanskip = 1; + frsky_rx_chanskip = 1; hopping_frequency_no = 0; - frskyx_rx_data_started = 0; - frskyx_rx_finetune = 0; + frsky_rx_data_started = 0; + frsky_rx_finetune = 0; telemetry_link = 0; if (IS_BIND_IN_PROGRESS) { - phase = FRSKYX_RX_TUNE_START; + phase = FRSKY_RX_TUNE_START; } else { - uint16_t temp = FRSKYX_RX_EEPROM_OFFSET; + uint16_t temp = FRSKY_RX_EEPROM_OFFSET; rx_tx_addr[0] = eeprom_read_byte((EE_ADDR)temp++); rx_tx_addr[1] = eeprom_read_byte((EE_ADDR)temp++); rx_tx_addr[2] = eeprom_read_byte((EE_ADDR)temp++); - frskyx_rx_finetune = eeprom_read_byte((EE_ADDR)temp++); + frsky_rx_finetune = eeprom_read_byte((EE_ADDR)temp++); for(uint8_t ch = 0; ch < 47; ch++) hopping_frequency[ch] = eeprom_read_byte((EE_ADDR)temp++); - frskyx_rx_calibrate(); + frsky_rx_calibrate(); CC2500_WriteReg(CC2500_18_MCSM0, 0x08); // FS_AUTOCAL = manual CC2500_WriteReg(CC2500_09_ADDR, rx_tx_addr[0]); // set address CC2500_WriteReg(CC2500_07_PKTCTRL1, 0x05); // check address if (option == 0) - CC2500_WriteReg(CC2500_0C_FSCTRL0, frskyx_rx_finetune); + CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune); else CC2500_WriteReg(CC2500_0C_FSCTRL0, option); - frskyx_rx_set_channel(hopping_frequency_no); - phase = FRSKYX_RX_DATA; + frsky_rx_set_channel(hopping_frequency_no); + phase = FRSKY_RX_DATA; } packet_length = (sub_protocol == FRSKYX_LBT) ? FRSKYX_LBT_LENGTH : FRSKYX_FCC_LENGTH; return 1000; } -uint16_t FrSkyX_Rx_callback() +uint16_t FrSky_Rx_callback() { static uint32_t pps_timer=0; static uint8_t pps_counter=0; @@ -219,78 +219,78 @@ uint16_t FrSkyX_Rx_callback() static int8_t tune_low, tune_high; uint8_t len, ch; - if ((prev_option != option) && (phase >= FRSKYX_RX_DATA)) { + if ((prev_option != option) && (phase >= FRSKY_RX_DATA)) { if (option == 0) - CC2500_WriteReg(CC2500_0C_FSCTRL0, frskyx_rx_finetune); + CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune); else CC2500_WriteReg(CC2500_0C_FSCTRL0, option); prev_option = option; } - if (frskyx_rx_disable_lna != IS_POWER_FLAG_on) { - frskyx_rx_disable_lna = IS_POWER_FLAG_on; - CC2500_SetTxRxMode(frskyx_rx_disable_lna ? TXRX_OFF : RX_EN); + if (frsky_rx_disable_lna != IS_POWER_FLAG_on) { + frsky_rx_disable_lna = IS_POWER_FLAG_on; + CC2500_SetTxRxMode(frsky_rx_disable_lna ? TXRX_OFF : RX_EN); } len = CC2500_ReadReg(CC2500_3B_RXBYTES | CC2500_READ_BURST) & 0x7F; switch(phase) { - case FRSKYX_RX_TUNE_START: + case FRSKY_RX_TUNE_START: if (len >= packet_length) { CC2500_ReadData(packet, packet_length); if(packet[1] == 0x03 && packet[2] == 0x01) { if(frskyx_rx_check_crc()) { - frskyx_rx_finetune = -127; - CC2500_WriteReg(CC2500_0C_FSCTRL0, frskyx_rx_finetune); - phase = FRSKYX_RX_TUNE_LOW; - frskyx_rx_strobe_rx(); + frsky_rx_finetune = -127; + CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune); + phase = FRSKY_RX_TUNE_LOW; + frsky_rx_strobe_rx(); return 1000; } } } - frskyx_rx_finetune += 10; - CC2500_WriteReg(CC2500_0C_FSCTRL0, frskyx_rx_finetune); - frskyx_rx_strobe_rx(); + frsky_rx_finetune += 10; + CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune); + frsky_rx_strobe_rx(); return 18000; - case FRSKYX_RX_TUNE_LOW: + case FRSKY_RX_TUNE_LOW: if (len >= packet_length) { CC2500_ReadData(packet, packet_length); if (frskyx_rx_check_crc()) { - tune_low = frskyx_rx_finetune; - frskyx_rx_finetune = 127; - CC2500_WriteReg(CC2500_0C_FSCTRL0, frskyx_rx_finetune); - phase = FRSKYX_RX_TUNE_HIGH; - frskyx_rx_strobe_rx(); + tune_low = frsky_rx_finetune; + frsky_rx_finetune = 127; + CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune); + phase = FRSKY_RX_TUNE_HIGH; + frsky_rx_strobe_rx(); return 1000; } } - frskyx_rx_finetune += 1; - CC2500_WriteReg(CC2500_0C_FSCTRL0, frskyx_rx_finetune); - frskyx_rx_strobe_rx(); + frsky_rx_finetune += 1; + CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune); + frsky_rx_strobe_rx(); return 18000; - case FRSKYX_RX_TUNE_HIGH: + case FRSKY_RX_TUNE_HIGH: if (len >= packet_length) { CC2500_ReadData(packet, packet_length); if (frskyx_rx_check_crc()) { - tune_high = frskyx_rx_finetune; - frskyx_rx_finetune = (tune_low + tune_high) / 2; - CC2500_WriteReg(CC2500_0C_FSCTRL0, (int8_t)frskyx_rx_finetune); + tune_high = frsky_rx_finetune; + frsky_rx_finetune = (tune_low + tune_high) / 2; + CC2500_WriteReg(CC2500_0C_FSCTRL0, (int8_t)frsky_rx_finetune); if(tune_low < tune_high) - phase = FRSKYX_RX_BIND; + phase = FRSKY_RX_BIND; else - phase = FRSKYX_RX_TUNE_START; - frskyx_rx_strobe_rx(); + phase = FRSKY_RX_TUNE_START; + frsky_rx_strobe_rx(); return 1000; } } - frskyx_rx_finetune -= 1; - CC2500_WriteReg(CC2500_0C_FSCTRL0, frskyx_rx_finetune); - frskyx_rx_strobe_rx(); + frsky_rx_finetune -= 1; + CC2500_WriteReg(CC2500_0C_FSCTRL0, frsky_rx_finetune); + frsky_rx_strobe_rx(); return 18000; - case FRSKYX_RX_BIND: + case FRSKY_RX_BIND: if(len >= packet_length) { CC2500_ReadData(packet, packet_length); if (frskyx_rx_check_crc()) { @@ -302,30 +302,30 @@ uint16_t FrSkyX_Rx_callback() } if (state == 0x3ff) { debugln("bind complete"); - frskyx_rx_calibrate(); + frsky_rx_calibrate(); rx_tx_addr[0] = packet[3]; // TXID rx_tx_addr[1] = packet[4]; // TXID rx_tx_addr[2] = packet[12]; // RX # CC2500_WriteReg(CC2500_18_MCSM0, 0x08); // FS_AUTOCAL = manual CC2500_WriteReg(CC2500_09_ADDR, rx_tx_addr[0]); // set address CC2500_WriteReg(CC2500_07_PKTCTRL1, 0x05); // check address - phase = FRSKYX_RX_DATA; - frskyx_rx_set_channel(hopping_frequency_no); + phase = FRSKY_RX_DATA; + frsky_rx_set_channel(hopping_frequency_no); // store txid and channel list - uint16_t temp = FRSKYX_RX_EEPROM_OFFSET; + uint16_t temp = FRSKY_RX_EEPROM_OFFSET; eeprom_write_byte((EE_ADDR)temp++, rx_tx_addr[0]); eeprom_write_byte((EE_ADDR)temp++, rx_tx_addr[1]); eeprom_write_byte((EE_ADDR)temp++, rx_tx_addr[2]); - eeprom_write_byte((EE_ADDR)temp++, frskyx_rx_finetune); + eeprom_write_byte((EE_ADDR)temp++, frsky_rx_finetune); for (ch = 0; ch < 47; ch++) eeprom_write_byte((EE_ADDR)temp++, hopping_frequency[ch]); BIND_DONE; } - frskyx_rx_strobe_rx(); + frsky_rx_strobe_rx(); } return 1000; - case FRSKYX_RX_DATA: + case FRSKY_RX_DATA: if (len >= packet_length) { CC2500_ReadData(packet, packet_length); if (packet[1] == rx_tx_addr[0] && packet[2] == rx_tx_addr[1] && packet[6] == rx_tx_addr[2] && frskyx_rx_check_crc()) { @@ -335,14 +335,14 @@ uint16_t FrSkyX_Rx_callback() else RX_RSSI += 128; // hop to next channel - frskyx_rx_chanskip = ((packet[4] & 0xC0) >> 6) | ((packet[5] & 0x3F) << 2); - hopping_frequency_no = (hopping_frequency_no + frskyx_rx_chanskip) % 47; - frskyx_rx_set_channel(hopping_frequency_no); + frsky_rx_chanskip = ((packet[4] & 0xC0) >> 6) | ((packet[5] & 0x3F) << 2); + hopping_frequency_no = (hopping_frequency_no + frsky_rx_chanskip) % 47; + frsky_rx_set_channel(hopping_frequency_no); if(packet[7] == 0 && telemetry_link == 0) { // standard packet, send channels to TX - frskyx_rx_build_telemetry_packet(); + frsky_rx_build_telemetry_packet(); telemetry_link = 1; } - frskyx_rx_data_started = 1; + frsky_rx_data_started = 1; read_retry = 0; pps_counter++; } @@ -358,9 +358,9 @@ uint16_t FrSkyX_Rx_callback() // skip channel if no packet received in time if (read_retry++ >= 9) { - hopping_frequency_no = (hopping_frequency_no + frskyx_rx_chanskip) % 47; - frskyx_rx_set_channel(hopping_frequency_no); - if(frskyx_rx_data_started) + hopping_frequency_no = (hopping_frequency_no + frsky_rx_chanskip) % 47; + frsky_rx_set_channel(hopping_frequency_no); + if(frsky_rx_data_started) read_retry = 0; else read_retry = -50; // retry longer until first packet is catched diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index dcad97a..8cd1c15 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -81,7 +81,7 @@ enum PROTOCOLS PROTO_ZSX = 52, // =>NRF24L01 PROTO_FLYZONE = 53, // =>A7105 PROTO_SCANNER = 54, // =>CC2500 - PROTO_FRSKYX_RX = 55, // =>CC2500 + PROTO_FRSKY_RX = 55, // =>CC2500 PROTO_AFHDS2A_RX= 56, // =>A7105 PROTO_XN297DUMP = 63, // =>NRF24L01 }; @@ -290,7 +290,7 @@ enum TRAXXAS { RX6519 = 0, }; -enum FRSKYX_RX +enum FRSKY_RX { FRSKYX_FCC = 0, FRSKYX_LBT @@ -594,7 +594,7 @@ enum { #define AFHDS2A_EEPROM_OFFSET 50 // RX ID, 4 bytes per model id, end is 50+64=114 #define BUGS_EEPROM_OFFSET 114 // RX ID, 2 bytes per model id, end is 114+32=146 #define BUGSMINI_EEPROM_OFFSET 146 // RX ID, 2 bytes per model id, end is 146+32=178 -#define FRSKYX_RX_EEPROM_OFFSET 178 // (3) TX ID + (1) freq_tune + (47) channels, 51 bytes, end is 178+51=229 +#define FRSKY_RX_EEPROM_OFFSET 178 // (3) TX ID + (1) freq_tune + (47) channels, 51 bytes, end is 178+51=229 #define AFHDS2A_RX_EEPROM_OFFSET 229 // (4) TX ID + (16) channels, 20 bytes, end is 229+20=249 #define AFHDS2A_EEPROM_OFFSET2 249 // RX ID, 4 bytes per model id, end is 249+192=441 //#define CONFIG_EEPROM_OFFSET 441 // Current configuration of the multimodule @@ -812,7 +812,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p -- RED_SLOW 1 sub_protocol==TRAXXAS RX6519 0 - sub_protocol==FRSKYX_RX + sub_protocol==FRSKY_RX FCC 0 LBT 1 diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index 3494c6f..e65809b 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -668,7 +668,7 @@ uint8_t Update_All() update_led_status(); #if defined(TELEMETRY) #if ( !( defined(MULTI_TELEMETRY) || defined(MULTI_STATUS) ) ) - if( (protocol == PROTO_FRSKYX_RX) || (protocol == PROTO_SCANNER) || (protocol==PROTO_FRSKYD) || (protocol==PROTO_BAYANG) || (protocol==PROTO_NCC1701) || (protocol==PROTO_BUGS) || (protocol==PROTO_BUGSMINI) || (protocol==PROTO_HUBSAN) || (protocol==PROTO_AFHDS2A) || (protocol==PROTO_FRSKYX) || (protocol==PROTO_DSM) || (protocol==PROTO_CABELL) || (protocol==PROTO_HITEC)) + if( (protocol == PROTO_FRSKY_RX) || (protocol == PROTO_SCANNER) || (protocol==PROTO_FRSKYD) || (protocol==PROTO_BAYANG) || (protocol==PROTO_NCC1701) || (protocol==PROTO_BUGS) || (protocol==PROTO_BUGSMINI) || (protocol==PROTO_HUBSAN) || (protocol==PROTO_AFHDS2A) || (protocol==PROTO_FRSKYX) || (protocol==PROTO_DSM) || (protocol==PROTO_CABELL) || (protocol==PROTO_HITEC)) #endif if(IS_DISABLE_TELEM_off && !(protocol==PROTO_XN297DUMP)) TelemetryUpdate(); @@ -1086,12 +1086,12 @@ static void protocol_init() remote_callback = Scanner_callback; break; #endif - #if defined(FRSKYX_RX_CC2500_INO) - case PROTO_FRSKYX_RX: + #if defined(FRSKY_RX_CC2500_INO) + case PROTO_FRSKY_RX: PE1_off; PE2_on; //antenna RF2 - next_callback = initFrSkyX_Rx(); - remote_callback = FrSkyX_Rx_callback; + next_callback = initFrSky_Rx(); + remote_callback = FrSky_Rx_callback; break; #endif #endif diff --git a/Multiprotocol/Telemetry.ino b/Multiprotocol/Telemetry.ino index 3ae816c..2d19b15 100644 --- a/Multiprotocol/Telemetry.ino +++ b/Multiprotocol/Telemetry.ino @@ -226,7 +226,7 @@ static void multi_send_status() } #endif -#if defined (FRSKYX_RX_TELEMETRY) || defined (AFHDS2A_RX_TELEMETRY) +#if defined (FRSKY_RX_TELEMETRY) || defined (AFHDS2A_RX_TELEMETRY) void receiver_channels_frame() { uint16_t len = packet_in[3] * 11; // 11 bit per channel @@ -861,8 +861,8 @@ void TelemetryUpdate() } #endif - #if defined (FRSKYX_RX_TELEMETRY) || defined(AFHDS2A_RX_TELEMETRY) - if (telemetry_link && (protocol == PROTO_FRSKYX_RX || protocol == PROTO_AFHDS2A_RX)) + #if defined (FRSKY_RX_TELEMETRY) || defined(AFHDS2A_RX_TELEMETRY) + if (telemetry_link && (protocol == PROTO_FRSKY_RX || protocol == PROTO_AFHDS2A_RX)) { receiver_channels_frame(); telemetry_link = 0; diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h index 51a2116..aa11e91 100644 --- a/Multiprotocol/Validate.h +++ b/Multiprotocol/Validate.h @@ -194,7 +194,7 @@ #undef HITEC_CC2500_INO #undef XN297L_CC2500_EMU #undef SCANNER_CC2500_INO - #undef FRSKYX_RX_CC2500_INO + #undef FRSKY_RX_CC2500_INO #endif #ifndef NRF24L01_INSTALLED #undef BAYANG_NRF24L01_INO @@ -253,8 +253,8 @@ #undef MULTI_TELEMETRY #undef SCANNER_TELEMETRY #undef SCANNER_CC2500_INO - #undef FRSKYX_RX_TELEMETRY - #undef FRSKYX_RX_CC2500_INO + #undef FRSKY_RX_TELEMETRY + #undef FRSKY_RX_CC2500_INO #undef AFHDS2A_RX_TELEMETRY #undef AFHDS2A_RX_A7105_INO #else @@ -265,9 +265,9 @@ #undef SCANNER_TELEMETRY #undef SCANNER_CC2500_INO #endif - #if not defined(FRSKYX_RX_CC2500_INO) || not defined(FRSKYX_RX_TELEMETRY) - #undef FRSKYX_RX_TELEMETRY - #undef FRSKYX_RX_CC2500_INO + #if not defined(FRSKY_RX_CC2500_INO) || not defined(FRSKY_RX_TELEMETRY) + #undef FRSKY_RX_TELEMETRY + #undef FRSKY_RX_CC2500_INO #endif #if not defined(AFHDS2A_RX_A7105_INO) || not defined(AFHDS2A_RX_TELEMETRY) #undef AFHDS2A_RX_TELEMETRY @@ -309,7 +309,7 @@ #if not defined(DSM_CYRF6936_INO) #undef DSM_TELEMETRY #endif - #if not defined(DSM_TELEMETRY) && not defined(SPORT_TELEMETRY) && not defined(HUB_TELEMETRY) && not defined(HUBSAN_HUB_TELEMETRY) && not defined(BUGS_HUB_TELEMETRY) && not defined(NCC1701_HUB_TELEMETRY) && not defined(BAYANG_HUB_TELEMETRY) && not defined(CABELL_HUB_TELEMETRY) && not defined(AFHDS2A_HUB_TELEMETRY) && not defined(AFHDS2A_FW_TELEMETRY) && not defined(MULTI_TELEMETRY) && not defined(MULTI_STATUS) && not defined(HITEC_HUB_TELEMETRY) && not defined(HITEC_FW_TELEMETRY) && not defined(SCANNER_TELEMETRY) && not defined(FRSKYX_RX_TELEMETRY) + #if not defined(DSM_TELEMETRY) && not defined(SPORT_TELEMETRY) && not defined(HUB_TELEMETRY) && not defined(HUBSAN_HUB_TELEMETRY) && not defined(BUGS_HUB_TELEMETRY) && not defined(NCC1701_HUB_TELEMETRY) && not defined(BAYANG_HUB_TELEMETRY) && not defined(CABELL_HUB_TELEMETRY) && not defined(AFHDS2A_HUB_TELEMETRY) && not defined(AFHDS2A_FW_TELEMETRY) && not defined(MULTI_TELEMETRY) && not defined(MULTI_STATUS) && not defined(HITEC_HUB_TELEMETRY) && not defined(HITEC_FW_TELEMETRY) && not defined(SCANNER_TELEMETRY) && not defined(FRSKY_RX_TELEMETRY) #undef TELEMETRY #undef INVERT_TELEMETRY #endif diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index 3efd302..3767a01 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -176,7 +176,7 @@ #define FRSKYD_CC2500_INO #define FRSKYV_CC2500_INO #define FRSKYX_CC2500_INO -#define FRSKYX_RX_CC2500_INO +#define FRSKY_RX_CC2500_INO #define HITEC_CC2500_INO #define SCANNER_CC2500_INO #define SFHSS_CC2500_INO @@ -288,7 +288,7 @@ #define HITEC_HUB_TELEMETRY // Use FrSkyD Hub format to send basic telemetry to the radios which can decode it like er9x, ersky9x and OpenTX #define HITEC_FW_TELEMETRY // Under development: Forward received telemetry packets to be decoded by ersky9x and OpenTX #define SCANNER_TELEMETRY // Forward spectrum scanner data to TX -#define FRSKYX_RX_TELEMETRY // Forward channels data to TX +#define FRSKY_RX_TELEMETRY // Forward channels data to TX #define AFHDS2A_RX_TELEMETRY // Forward channels data to TX /****************************/ @@ -545,7 +545,7 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { CH_8 EU_16 EU_8 - PROTO_FRSKYX_RX + PROTO_FRSKY_RX FRSKYX_FCC FRSKYX_LBT PROTO_FY326