Fix FrskyX failsafe hold/no pulse inversion

Discard RX config packets

BootLoaders/package_multi_4in1_board_index.json

@@ -134,6 +134,24 @@
         ],
         "toolsDependencies": []
       },
+      {
+        "name": "Multi 4-in-1 AVR Boards",
+        "architecture": "avr",
+        "version": "1.0.9",
+        "category": "Contributed",
+        "help": {
+          "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
+        },
+        "url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/raw/master/archives/package_multi_4in1_avr_board_v1.0.9.tar.gz",
+        "archiveFileName": "package_multi_4in1_avr_board_v1.0.9.tar.gz",
+        "checksum": "SHA-256:269c4ddcb8018be2b31f5c9e9f0814d120af492e894b8d5098a814486d56faa5",
+        "size": "318437",
+        "boards": [
+          {"name": "Multi 4-in-1 (Atmega328p, 3.3V, 16MHz)"},
+          {"name": "Multi 4-in-1 (OrangeRX)"}
+        ],
+        "toolsDependencies": []
+      },
       {
         "name": "Multi 4-in-1 STM32 Board",
         "architecture": "STM32F1",
@@ -449,6 +467,27 @@
           "version": "4.8.3-2014q1"
         }]
       },
+      {
+        "name": "Multi 4-in-1 STM32 Board",
+        "architecture": "STM32F1",
+        "version": "1.1.6",
+        "category": "Contributed",
+        "help": {
+          "online": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module"
+        },
+        "url": "https://github.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/raw/master/archives/package_multi_4in1_stm32_board_v1.1.6.tar.gz",
+        "archiveFileName": "package_multi_4in1_stm32_board_v1.1.6.tar.gz",
+        "checksum": "SHA-256:d2d1ef721bbcdc3c680c6f98b4b8ab394478ac0f82d67af2f6c389a4a30789f4",
+        "size": "7962942",
+        "boards": [{
+          "name": "Multi 4-in-1 (STM32F103C)"
+        }],
+        "toolsDependencies": [{
+          "packager": "arduino",
+          "name": "arm-none-eabi-gcc",
+          "version": "4.8.3-2014q1"
+        }]
+      },
       {
         "name": "Multi 4-in-1 OrangeRX Board - DEPRECATED, USE MULTI 4-IN-1 AVR BOARDS PACKAGE INSTEAD",
         "architecture": "orangerx",

Multiprotocol/AFHDS2A_a7105.ino

@@ -78,23 +78,26 @@ enum{
 
 static void AFHDS2A_update_telemetry()
 {
+	if(packet[0]==0xAA && packet[9]==0xFD)
+		return;	// ignore packets which contain the RX configuration: FD FF 32 00 01 00 FF FF FF 05 DC 05 DE FA FF FF FF FF FF FF FF FF FF FF FF FF FF FF
 	// Read TX RSSI
 	int16_t temp=256-(A7105_ReadReg(A7105_1D_RSSI_THOLD)*8)/5;		// value from A7105 is between 8 for maximum signal strength to 160 or less
 	if(temp<0) temp=0;
 	else if(temp>255) temp=255;
 	TX_RSSI=temp;
 	// AA | TXID | rx_id | sensor id | sensor # | value 16 bit big endian | sensor id ......
-	// max 7 sensors per packet
+	// AC | TXID | rx_id | sensor id | sensor # | length | bytes | sensor id ......
 	#ifdef AFHDS2A_FW_TELEMETRY
 		if (option & 0x80)
 		{// forward 0xAA and 0xAC telemetry to TX, skip rx and tx id to save space
 			pkt[0]= TX_RSSI;
-			debug("T=");
-			for(int i=9;i < AFHDS2A_RXPACKET_SIZE; i++)
+			debug("T(%02X)=",packet[0]);
+			for(uint8_t i=9;i < AFHDS2A_RXPACKET_SIZE; i++)
 			{
 				pkt[i-8]=packet[i];
 				debug(" %02X",packet[i]);
 			}
+			pkt[29]=packet[0];	// 0xAA Normal telemetry, 0xAC Extended telemetry
 			telemetry_link=2;
 			debugln("");
 			return;

Multiprotocol/Common.ino

@@ -163,6 +163,29 @@ uint16_t convert_channel_frsky(uint8_t num)
 /******************************/
 /**  FrSky D and X routines  **/
 /******************************/
+
+#if defined(FRSKYX_CC2500_INO) || defined(FRSKYX_RX_CC2500_INO)
+//**CRC**
+const uint16_t PROGMEM frskyX_CRC_Short[]={
+	0x0000, 0x1189, 0x2312, 0x329B, 0x4624, 0x57AD, 0x6536, 0x74BF,
+	0x8C48, 0x9DC1, 0xAF5A, 0xBED3, 0xCA6C, 0xDBE5, 0xE97E, 0xF8F7 };
+static uint16_t __attribute__((unused)) frskyX_CRCTable(uint8_t val)
+{
+	uint16_t word ;
+	word = pgm_read_word(&frskyX_CRC_Short[val&0x0F]) ;
+	val /= 16 ;
+	return word ^ (0x1081 * val) ;
+}
+uint16_t frskyX_crc_x(uint8_t *data, uint8_t len)
+{
+	uint16_t crc = 0;
+	for(uint8_t i=0; i < len; i++)
+		crc = (crc<<8) ^ frskyX_CRCTable((uint8_t)(crc>>8) ^ *data++);
+	return crc;
+}
+#endif
+
+
 #if defined(FRSKYD_CC2500_INO) || defined(FRSKYX_CC2500_INO)
 enum {
 	FRSKY_BIND		= 0,

Multiprotocol/FrSkyX_Rx_cc2500.ino

@@ -0,0 +1,301 @@
+/*
+ This project is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Multiprotocol is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Multiprotocol.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if defined(FRSKYX_RX_CC2500_INO)
+
+#include "iface_cc2500.h" 
+
+ #define FRSKYX_FCC_LENGTH	30+2
+ #define FRSKYX_LBT_LENGTH	33+2
+
+ enum {
+	FRSKYX_RX_BIND,
+	FRSKYX_RX_DATA,
+ };
+
+ static uint8_t frskyx_rx_chanskip;
+ static uint8_t frskyx_rx_disable_lna;
+ static uint8_t frskyx_rx_data_started;
+
+static void __attribute__((unused)) FrSkyX_Rx_initialise() {
+	CC2500_Reset();
+	
+	CC2500_WriteReg(CC2500_02_IOCFG0, 0x01);
+	CC2500_WriteReg(CC2500_18_MCSM0, 0x18);
+	CC2500_WriteReg(CC2500_07_PKTCTRL1, 0x04);
+	CC2500_WriteReg(CC2500_3E_PATABLE, 0xFF);
+	CC2500_WriteReg(CC2500_0C_FSCTRL0, option); // Frequency offset hack
+	CC2500_WriteReg(CC2500_0D_FREQ2, 0x5C);
+	CC2500_WriteReg(CC2500_13_MDMCFG1, 0x23);
+	CC2500_WriteReg(CC2500_14_MDMCFG0, 0x7A);
+	CC2500_WriteReg(CC2500_19_FOCCFG, 0x16);
+	CC2500_WriteReg(CC2500_1A_BSCFG, 0x6C);
+	CC2500_WriteReg(CC2500_1B_AGCCTRL2, 0x03);
+	CC2500_WriteReg(CC2500_1C_AGCCTRL1, 0x40);
+	CC2500_WriteReg(CC2500_1D_AGCCTRL0, 0x91);
+	CC2500_WriteReg(CC2500_21_FREND1, 0x56);
+	CC2500_WriteReg(CC2500_22_FREND0, 0x10);
+	CC2500_WriteReg(CC2500_23_FSCAL3, 0xA9);
+	CC2500_WriteReg(CC2500_24_FSCAL2, 0x0A);
+	CC2500_WriteReg(CC2500_25_FSCAL1, 0x00);
+	CC2500_WriteReg(CC2500_26_FSCAL0, 0x11);
+	CC2500_WriteReg(CC2500_29_FSTEST, 0x59);
+	CC2500_WriteReg(CC2500_2C_TEST2, 0x88);
+	CC2500_WriteReg(CC2500_2D_TEST1, 0x31);
+	CC2500_WriteReg(CC2500_2E_TEST0, 0x0B);
+	CC2500_WriteReg(CC2500_03_FIFOTHR, 0x07);
+	CC2500_WriteReg(CC2500_09_ADDR, 0x00);
+
+	switch (sub_protocol) {
+	case FRSKYX_FCC:
+		CC2500_WriteReg(CC2500_17_MCSM1, 0x0C);
+		CC2500_WriteReg(CC2500_0E_FREQ1, 0x76);
+		CC2500_WriteReg(CC2500_0F_FREQ0, 0x27);
+		CC2500_WriteReg(CC2500_06_PKTLEN, 0x1E);
+		CC2500_WriteReg(CC2500_08_PKTCTRL0, 0x01);
+		CC2500_WriteReg(CC2500_0B_FSCTRL1, 0x0A);
+		CC2500_WriteReg(CC2500_10_MDMCFG4, 0x7B);
+		CC2500_WriteReg(CC2500_11_MDMCFG3, 0x61);
+		CC2500_WriteReg(CC2500_12_MDMCFG2, 0x13);
+		CC2500_WriteReg(CC2500_15_DEVIATN, 0x51);
+		break;
+	case FRSKYX_LBT:
+		CC2500_WriteReg(CC2500_17_MCSM1, 0x0E);
+		CC2500_WriteReg(CC2500_0E_FREQ1, 0x80);
+		CC2500_WriteReg(CC2500_0F_FREQ0, 0x00);
+		CC2500_WriteReg(CC2500_06_PKTLEN, 0x23);
+		CC2500_WriteReg(CC2500_08_PKTCTRL0, 0x01);
+		CC2500_WriteReg(CC2500_0B_FSCTRL1, 0x08);
+		CC2500_WriteReg(CC2500_10_MDMCFG4, 0x7B);
+		CC2500_WriteReg(CC2500_11_MDMCFG3, 0xF8);
+		CC2500_WriteReg(CC2500_12_MDMCFG2, 0x03);
+		CC2500_WriteReg(CC2500_15_DEVIATN, 0x53);
+		break;
+	}
+
+	frskyx_rx_disable_lna = IS_POWER_FLAG_on;
+	CC2500_SetTxRxMode(frskyx_rx_disable_lna ? TXRX_OFF : RX_EN); // lna disable / enable
+
+	CC2500_Strobe(CC2500_SIDLE);
+	CC2500_Strobe(CC2500_SFRX);
+	CC2500_Strobe(CC2500_SRX);
+	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)
+{
+	CC2500_WriteReg(CC2500_0A_CHANNR, hopping_frequency[channel]);
+	CC2500_WriteReg(CC2500_25_FSCAL1, calData[channel]);
+	CC2500_Strobe(CC2500_SIDLE);
+	CC2500_Strobe(CC2500_SFRX);
+	CC2500_Strobe(CC2500_SRX);
+}
+
+static void __attribute__((unused)) frskyx_rx_calibrate()
+{
+	CC2500_Strobe(CC2500_SIDLE);
+	CC2500_Strobe(CC2500_SFRX);
+	CC2500_Strobe(CC2500_SRX);
+	for (unsigned c = 0; c < 47; c++)
+	{
+		CC2500_Strobe(CC2500_SIDLE);
+		CC2500_WriteReg(CC2500_0A_CHANNR, hopping_frequency[c]);
+		CC2500_Strobe(CC2500_SCAL);
+		delayMicroseconds(900);
+		calData[c] = CC2500_ReadReg(CC2500_25_FSCAL1);
+	}
+}
+
+static uint8_t __attribute__((unused)) frskyx_rx_check_crc()
+{
+	uint8_t limit = packet_length - 4;
+	uint16_t lcrc = frskyX_crc_x(&packet[3], limit - 3); // computed crc
+	uint16_t rcrc = (packet[limit] << 8) | (packet[limit + 1] & 0xff); // received crc
+	return lcrc == rcrc;
+}
+
+static void __attribute__((unused)) frskyx_rx_build_telemetry_packet()
+{
+	static uint16_t frskyx_rx_rc_chan[16];
+	uint16_t pxx_channel[8];
+	uint32_t bits = 0;
+	uint8_t bitsavailable = 0;
+	uint8_t idx = 0;
+
+	// decode PXX channels
+	pxx_channel[0] = ((packet[10] << 8) & 0xF00) | packet[9];
+	pxx_channel[1] = ((packet[11] << 4) & 0xFF0) | (packet[10] >> 4);
+	pxx_channel[2] = ((packet[13] << 8) & 0xF00) | packet[12];
+	pxx_channel[3] = ((packet[14] << 4) & 0xFF0) | (packet[13] >> 4);
+	pxx_channel[4] = ((packet[16] << 8) & 0xF00) | packet[15];
+	pxx_channel[5] = ((packet[17] << 4) & 0xFF0) | (packet[16] >> 4);
+	pxx_channel[6] = ((packet[19] << 8) & 0xF00) | packet[18];
+	pxx_channel[7] = ((packet[20] << 4) & 0xFF0) | (packet[19] >> 4);
+	for (unsigned i = 0; i < 8; i++) {
+		uint8_t shifted = (pxx_channel[i] & 0x800)>0;
+		uint16_t channel_value = pxx_channel[i] & 0x7FF;
+		if (channel_value < 64)
+			frskyx_rx_rc_chan[shifted ? i + 8 : i] = 0;
+		else
+			frskyx_rx_rc_chan[shifted ? i + 8 : i] = min(((channel_value - 64) << 4) / 15, 2047);
+	}
+
+	// buid telemetry packet
+	pkt[idx++] = RX_LQI;
+	pkt[idx++] = RX_RSSI;
+	pkt[idx++] = 0;  // start channel
+	pkt[idx++] = 16; // number of channels in packet
+
+	// pack channels
+	for (int i = 0; i < 16; i++) {
+		bits |= frskyx_rx_rc_chan[i] << bitsavailable;
+		bitsavailable += 11;
+		while (bitsavailable >= 8) {
+			pkt[idx++] = bits & 0xff;
+			bits >>= 8;
+			bitsavailable -= 8;
+		}
+	}
+}
+
+uint16_t initFrSkyX_Rx()
+{
+	FrSkyX_Rx_initialise();
+	state = 0;
+	frskyx_rx_chanskip = 1;
+	hopping_frequency_no = 0;
+	frskyx_rx_data_started = 0;
+	telemetry_link = 0;
+	if (IS_BIND_IN_PROGRESS) {
+		phase = FRSKYX_RX_BIND;
+	}
+	else {
+		uint16_t temp = FRSKYX_RX_EEPROM_OFFSET;
+		rx_tx_addr[0] = eeprom_read_byte(temp++);
+		rx_tx_addr[1] = eeprom_read_byte(temp++);
+		rx_tx_addr[2] = eeprom_read_byte(temp++);
+		for(uint8_t ch = 0; ch < 47; ch++)
+			hopping_frequency[ch] = eeprom_read_byte(temp++);
+		frskyx_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
+		frskyx_rx_set_channel(hopping_frequency_no);
+		phase = FRSKYX_RX_DATA;
+	}
+	packet_length = (sub_protocol == FRSKYX_LBT) ? FRSKYX_LBT_LENGTH : FRSKYX_FCC_LENGTH;
+	return 1000;
+}
+
+uint16_t FrSkyX_Rx_callback()
+{
+	static uint32_t pps_timer=0;
+	static uint8_t pps_counter=0;
+	static int8_t read_retry = 0;
+	uint8_t len, ch;
+	if (prev_option != option)
+	{
+		CC2500_WriteReg(CC2500_0C_FSCTRL0, option);	// Frequency offset hack
+		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);
+	}
+	switch(phase) {
+	case FRSKYX_RX_BIND:
+		len = CC2500_ReadReg(CC2500_3B_RXBYTES | CC2500_READ_BURST) & 0x7F;
+		if(len >= packet_length) {
+			CC2500_ReadData(packet, packet_length);
+			if (frskyx_rx_check_crc()) {
+				if (packet[5] <= 0x2D) {
+					for (ch = 0; ch < 5; ch++)
+						hopping_frequency[packet[5]+ch] = packet[6+ch];
+					state |= 1 << (packet[5] / 5);
+				}
+			}
+			if (state == 0x3ff) {
+				debugln("bind complete");
+				frskyx_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);
+				// store txid and channel list
+				uint16_t temp = FRSKYX_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]);
+				for (ch = 0; ch < 47; ch++)
+					eeprom_write_byte((EE_ADDR)temp++, hopping_frequency[ch]);
+				BIND_DONE;
+			}
+			CC2500_Strobe(CC2500_SIDLE);
+			CC2500_Strobe(CC2500_SFRX);
+			CC2500_Strobe(CC2500_SRX);
+		}
+		return 1000;
+	case FRSKYX_RX_DATA:
+		len = CC2500_ReadReg(CC2500_3B_RXBYTES | CC2500_READ_BURST) & 0x7F;
+		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()) {
+				RX_RSSI = packet[packet_length-2];
+				if(RX_RSSI >= 128)
+					RX_RSSI -= 128;
+				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);
+				if(packet[7] == 0 && telemetry_link == 0) { // standard packet, send channels to TX
+						frskyx_rx_build_telemetry_packet();
+						telemetry_link = 1;
+				}
+				frskyx_rx_data_started = 1;
+				read_retry = 0;
+				pps_counter++;
+			}
+		}
+		
+		// packets per second
+		if (millis() - pps_timer >= 1000) {
+			pps_timer = millis();
+			debugln("%ld pps", pps_counter);
+			RX_LQI = pps_counter;
+			pps_counter = 0;
+		}
+
+		// 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)
+				read_retry = 0;
+			else
+				read_retry = -50; // retry longer until first packet is catched
+		}
+		break;
+	}
+	return 1000;
+}
+
+#endif

Multiprotocol/FrSkyX_cc2500.ino

@@ -55,25 +55,6 @@ static void __attribute__((unused)) frskyX_initialize_data(uint8_t adr)
 	CC2500_WriteReg(CC2500_07_PKTCTRL1,0x05);
 }
 
-//**CRC**
-const uint16_t PROGMEM frskyX_CRC_Short[]={
-	0x0000, 0x1189, 0x2312, 0x329B, 0x4624, 0x57AD, 0x6536, 0x74BF,
-	0x8C48, 0x9DC1, 0xAF5A, 0xBED3, 0xCA6C, 0xDBE5, 0xE97E, 0xF8F7 };
-static uint16_t __attribute__((unused)) frskyX_CRCTable(uint8_t val)
-{
-	uint16_t word ;
-	word = pgm_read_word(&frskyX_CRC_Short[val&0x0F]) ;
-	val /= 16 ;
-	return word ^ (0x1081 * val) ;
-}
-static uint16_t __attribute__((unused)) frskyX_crc_x(uint8_t *data, uint8_t len)
-{
-	uint16_t crc = 0;
-	for(uint8_t i=0; i < len; i++)
-		crc = (crc<<8) ^ frskyX_CRCTable((uint8_t)(crc>>8) ^ *data++);
-	return crc;
-}
-
 static void __attribute__((unused)) frskyX_build_bind_packet()
 {
 	packet[0] = (sub_protocol & 2 ) ? 0x20 : 0x1D ; // LBT or FCC

Multiprotocol/Hitec_cc2500.ino

@@ -324,12 +324,20 @@ uint16_t ReadHITEC()
 							//		0C,1C,A1,2B,00,17,00,00,00,42,44,17,00,48,8D	-> 42=>temperature3 0x42-0x28=26°C,44=>temperature4 0x44-0x28=28°C
 							//		0C,1C,A1,2B,00,18,00,00,00,00,00,18,00,50,92
 							debug(",telem,%02x",pkt[14]&0x7F);
+							#if defined(HITEC_FW_TELEMETRY) || defined(HITEC_HUB_TELEMETRY)
+								TX_RSSI = pkt[13];
+								if(TX_RSSI >=128)
+									TX_RSSI -= 128;
+								else
+									TX_RSSI += 128;
+								TX_LQI = pkt[14]&0x7F;
+							#endif
 							#if defined(HITEC_FW_TELEMETRY)
 								if(sub_protocol==OPT_FW)
 								{
 									// 8 bytes telemetry packets => see at the end of this file how to fully decode it
-									pkt[0]=pkt[13];				// TX RSSI
-									pkt[1]=pkt[14]&0x7F;		// TX LQI
+									pkt[0]=TX_RSSI;				// TX RSSI
+									pkt[1]=TX_LQI;				// TX LQI
 									uint8_t offset=pkt[5]==0?1:0;
 									for(uint8_t i=5;i < 11; i++)
 										pkt[i-3]=pkt[i+offset];	// frame number followed by 5 bytes of data
@@ -351,12 +359,6 @@ uint16_t ReadHITEC()
 											v_lipo2 =  (pkt[6])<<5 | (pkt[7])>>3;	// calculation in float is volt=(pkt[6]<<8+pkt[7])/10
 											break;
 									}
-									TX_RSSI = pkt[13];
-									if(TX_RSSI >=128)
-										TX_RSSI -= 128;
-									else
-										TX_RSSI += 128;
-									TX_LQI = pkt[14]&0x7F;
 									telemetry_link=1;			// telemetry hub available
 								}
 							#endif
@@ -403,7 +405,7 @@ packet[1] = TX LQI value
 packet[2] = frame number
 packet[3-7] telemetry data
 
-The frame number takes the following values: 0x00, 0x11, 0x12, ..., 0x18. The frames can be present or not, they also do not have to follow each others.
+The frame number takes the following values: 0x00, 0x11, 0x12, ..., 0x1C. The frames can be present or not, they also do not have to follow each others.
 Here is a description of the telemetry data for each frame number:
 - frame 0x00
 data byte 0 -> 0x00				unknown
@@ -414,9 +416,9 @@ data byte 4 -> RX Batt Volt_L => RX Batt=(Volt_H*256+Volt_L)/28
 - frame 0x11
 data byte 0 -> 0xAF				start of frame
 data byte 1 -> 0x00				unknown
-data byte 2 -> 0x2D				frame type but constant here
-data byte 3 -> Volt1_H
-data byte 4 -> Volt1_L			RX Batt=(Volt1_H*256+Volt1_L)/28 V
+data byte 2 -> 0x2D				station type 0x2D=standard station nitro or electric, 0xAC=advanced station
+data byte 3 -> RX Batt Volt_H
+data byte 4 -> RX Batt Volt_L => RX Batt=(Volt_H*256+Volt_L)/28
 - frame 0x12
 data byte 0 -> Lat_sec_H		GPS : latitude second
 data byte 1 -> Lat_sec_L		signed int : 1/100 of second
@@ -431,9 +433,9 @@ data byte 3 -> 					signed int : +=Est, - = west
 data byte 4 -> Temp2			Temperature2=Temp2-40°C
 - frame 0x14
 data byte 0 -> Speed_H
-data byte 1 -> Speed_L			Speed=Speed_H*256+Speed_L km/h
+data byte 1 -> Speed_L			GPS Speed=Speed_H*256+Speed_L km/h
 data byte 2 -> Alti_sea_H
-data byte 3 -> Alti_sea_L		Altitude sea=Alti_sea_H*256+Alti_sea_L m
+data byte 3 -> Alti_sea_L		GPS Altitude=Alti_sea_H*256+Alti_sea_L m
 data byte 4 -> Temp1			Temperature1=Temp1-40°C
 - frame 0x15
 data byte 0 -> FUEL
@@ -448,15 +450,29 @@ data byte 2 -> Date_day
 data byte 3 -> Time_hour		GPS Time
 data byte 4 -> Time_min
 - frame 0x17
-data byte 0 -> 0x00	COURSEH
-data byte 1 -> 0x00	COURSEL		GPS Course = COURSEH*256+COURSEL
-data byte 2 -> 0x00				GPS count
+data byte 0 -> COURSEH
+data byte 1 -> COURSEL			GPS heading = COURSEH*256+COURSEL in degrees
+data byte 2 -> Count			GPS satellites
 data byte 3 -> Temp3			Temperature3=Temp2-40°C
 data byte 4 -> Temp4			Temperature4=Temp3-40°C
 - frame 0x18
-data byte 1 -> Volt2_H
-data byte 2 -> Volt2_L			Volt2=(Volt2_H*256+Volt2_L)/10 V
-data byte 3 -> AMP1_L
-data byte 4 -> AMP1_H			Amp=(AMP1_H*256+AMP1_L -180)/14 in signed A
+data byte 1 -> Volt_H
+data byte 2 -> Volt_L			Volt=(Volt_H*256+Volt_L)/10 V
+data byte 3 -> AMP_L
+data byte 4 -> AMP_H			Amp=(AMP1_*256+AMP_L -180)/14 in signed A
+- frame 0x19					Servo sensor
+data byte 0 -> AMP_Servo1		Amp=AMP_Servo1/10 in A
+data byte 1 -> AMP_Servo2		Amp=AMP_Servo2/10 in A
+data byte 2 -> AMP_Servo3		Amp=AMP_Servo3/10 in A
+data byte 3 -> AMP_Servo4		Amp=AMP_Servo4/10 in A
+- frame 0x1A
+data byte 2 -> ASpeed_H			Air speed=ASpeed_H*256+ASpeed_L km/h
+data byte 3 -> ASpeed_L
+- frame 0x1B					Variometer sensor
+data byte 0 -> Alti1H
+data byte 1 -> Alti1L			Altitude unfiltered
+data byte 2 -> Alti2H
+data byte 3 -> Alti2L			Altitude filtered
+- frame 0x1C					Unknown
 */
 #endif

Multiprotocol/Multi.txt

@@ -52,4 +52,5 @@
 52,ZSX,280
 53,Flyzone,FZ-410
 54,Scanner
+55,FrskyX_RX,FCC,EU_LBT
 63,XN_DUMP,250K,1M,2M

Multiprotocol/Multiprotocol.h

@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		2
 #define VERSION_REVISION	1
-#define VERSION_PATCH_LEVEL	76
+#define VERSION_PATCH_LEVEL	80
 
 //******************
 // Protocols
@@ -81,6 +81,7 @@ enum PROTOCOLS
 	PROTO_ZSX		= 52,	// =>NRF24L01
 	PROTO_FLYZONE	= 53,	// =>A7105
 	PROTO_SCANNER	= 54,	// =>CC2500
+	PROTO_FRSKYX_RX	= 55,	// =>CC2500
 	PROTO_XN297DUMP	= 63,	// =>NRF24L01
 };
 
@@ -288,6 +289,11 @@ enum TRAXXAS
 {
 	RX6519	= 0,
 };
+enum FRSKYX_RX
+{
+	FRSKYX_FCC	= 0,
+	FRSKYX_LBT
+};
 
 #define NONE 		0
 #define P_HIGH		1
@@ -320,6 +326,8 @@ enum MultiPacketTypes
 	MULTI_TELEMETRY_SPORT_POLLING	= 9,
 	MULTI_TELEMETRY_HITEC			= 10,
 	MULTI_TELEMETRY_SCANNER			= 11,
+	MULTI_TELEMETRY_AFHDS2A_AC		= 12,
+	MULTI_TELEMETRY_RX_CHANNELS		= 13,
 };
 
 // Macros
@@ -397,8 +405,8 @@ enum MultiPacketTypes
 #define IS_WAIT_BIND_off	( ( protocol_flags2 & _BV(7) ) ==0 )
 
 // Failsafe
-#define FAILSAFE_CHANNEL_HOLD		2047
-#define	FAILSAFE_CHANNEL_NOPULSES	0
+#define FAILSAFE_CHANNEL_HOLD		0
+#define	FAILSAFE_CHANNEL_NOPULSES	2047
 
 //********************
 //** Debug messages **
@@ -566,6 +574,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 + (47) channels + (1) freq_tune, 51 bytes per model, end is 178+51=229
 //#define CONFIG_EEPROM_OFFSET 	210		// Current configuration of the multimodule
 
 //****************************************
@@ -639,6 +648,7 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
 					ZSX			52
 					FLYZONE		53
 					SCANNER		54
+					FRSKYX_RX	55
    BindBit=>		0x80	1=Bind/0=No
    AutoBindBit=>	0x40	1=Yes /0=No
    RangeCheck=>		0x20	1=Yes /0=No
@@ -780,6 +790,9 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
 			RED_SLOW	1
 		sub_protocol==TRAXXAS
 			RX6519		0
+		sub_protocol==FRSKYX_RX
+			FCC			0
+			LBT			1
 
    Power value => 0x80	0=High/1=Low
   Stream[3]   = option_protocol;
@@ -864,7 +877,6 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
 
 	*No* usual frsky byte stuffing and without start/stop byte (0x7e)
 
-
   Type 0x04 Spektrum telemetry data
    data[0] TX RSSI
    data[1-15] telemetry data
@@ -875,7 +887,7 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
     technically DSM bind data is only 10 bytes but multi sends 16
     like with telemtery, check length field)
 
-  Type 0x06 Flysky AFHDS2 telemetry data
+  Type 0x06 Flysky AFHDS2 telemetry data type 0xAA
    length: 29
    data[0] = RSSI value
    data[1-28] telemetry data
@@ -888,8 +900,22 @@ Serial: 100000 Baud 8e2      _ xxxx xxxx p --
    data[3-7] telemetry data
    Full description at the bottom of Hitec_cc2500.ino
 
-   Type 0x0B Spectrum Scanner telemetry data
+  Type 0x0B Spectrum Scanner telemetry data
    length: 6
    data[0] = start channel (2400 + x*0.333 Mhz)
    data[1-5] power levels
+
+  Type 0x0C Flysky AFHDS2 telemetry data type 0xAC
+   length: 29
+   data[0] = RSSI value
+   data[1-28] telemetry data
+
+  Type 0x0D RX channels forwarding
+   length: variable
+   data[0] = received packets per second
+   data[1] = rssi
+   data[2] = start channel
+   data[3] = number of channels to follow
+   data[4-]= packed channels data, 11 bit per channel
+
 */

Multiprotocol/Multiprotocol.ino

@@ -171,7 +171,7 @@ volatile uint8_t rx_ok_buff[RXBUFFER_SIZE];
 volatile uint8_t discard_frame = 0;
 
 // Telemetry
-#define MAX_PKT 29
+#define MAX_PKT 30
 uint8_t pkt[MAX_PKT];//telemetry receiving packets
 #if defined(TELEMETRY)
 	#ifdef INVERT_TELEMETRY
@@ -647,7 +647,7 @@ uint8_t Update_All()
 	update_led_status();
 	#if defined(TELEMETRY)
 		#if ( !( defined(MULTI_TELEMETRY) || defined(MULTI_STATUS) ) )
-			if( (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_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))
 		#endif
 				TelemetryUpdate();
 	#endif
@@ -1028,6 +1028,14 @@ static void protocol_init()
 						remote_callback = Scanner_callback;
 						break;
 				#endif
+				#if defined(FRSKYX_RX_CC2500_INO)
+					case PROTO_FRSKYX_RX:
+						PE1_off;
+						PE2_on;	//antenna RF2
+						next_callback = initFrSkyX_Rx();
+						remote_callback = FrSkyX_Rx_callback;
+						break;
+				#endif
 			#endif
 			#ifdef CYRF6936_INSTALLED
 				#if defined(DSM_CYRF6936_INO)
@@ -1465,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=no pulses, 2047=hold
+				Failsafe_data[i]=temp;			//value range 0..2047, 0=hold, 2047=no pulses
 			else
 		#endif
 				Channel_data[i]=temp;			//value range 0..2047, 0=-125%, 2047=+125%
@@ -1962,3 +1970,20 @@ static uint32_t random_id(uint16_t address, uint8_t create_new)
 		}
 	}
 #endif
+
+// Set the flags for detecting and writing the firmware signature
+#if defined (CHECK_FOR_BOOTLOADER)
+    bool firmwareFlag_CHECK_FOR_BOOTLOADER = true;
+#endif
+#if defined (MULTI_STATUS)
+    bool firmwareFlag_MULTI_STATUS = true;
+#endif
+#if defined (MULTI_TELEMETRY)
+    bool firmwareFlag_MULTI_TELEMETRY = true;
+#endif
+#if defined (INVERT_TELEMETRY)
+    bool firmwareFlag_INVERT_TELEMETRY = true;
+#endif
+#if defined (DEBUG_SERIAL)
+    bool firmwareFlag_DEBUG_SERIAL = true;
+#endif

Multiprotocol/Scanner_cc2500.ino

@@ -18,8 +18,9 @@
 #include "iface_cc2500.h"
 
 #define SCAN_MAX_RADIOCHANNEL	249 // 2483 MHz
-#define SCAN_CHANNEL_LOCK_TIME	300 // with precalibration, channel requires only 90 usec for synthesizer to settle
-#define SCAN_AVERAGE_INTVL		30
+#define SCAN_CHANNEL_LOCK_TIME	210 // with precalibration, channel requires only 90 usec for synthesizer to settle
+#define SCAN_AVERAGE_INTVL		20
+#define SCAN_MAX_COUNT			5
 #define SCAN_CHANS_PER_PACKET	5
 
 static uint8_t scan_tlm_index;
@@ -96,25 +97,38 @@ static int __attribute__((unused)) Scanner_scan_rssi()
 
 uint16_t Scanner_callback()
 {
+	static uint8_t max_count, max_rssi;
+	uint8_t rssi;
 	switch (phase)
 	{
 		case SCAN_CHANNEL_CHANGE:
-			rf_ch_num++;
-			if (rf_ch_num >= (SCAN_MAX_RADIOCHANNEL + 1))
-				rf_ch_num = 0;
-			if (scan_tlm_index++ == 0)
-				pkt[0] = rf_ch_num;  // start channel for telemetry packet
-			Scanner_scan_next();
-			phase = SCAN_GET_RSSI;
+			if(telemetry_link == 0) {
+				max_count = 0;
+				max_rssi = 0;
+				rf_ch_num++;
+				if (rf_ch_num >= (SCAN_MAX_RADIOCHANNEL + 1))
+					rf_ch_num = 0;
+				if (scan_tlm_index++ == 0)
+					pkt[0] = rf_ch_num;  // start channel for telemetry packet
+				Scanner_scan_next();
+				phase = SCAN_GET_RSSI;
+			}
 			return SCAN_CHANNEL_LOCK_TIME;
 		case SCAN_GET_RSSI:
-			phase = SCAN_CHANNEL_CHANGE;
-			pkt[scan_tlm_index] = Scanner_scan_rssi();
-			if (scan_tlm_index == SCAN_CHANS_PER_PACKET)
-			{
-				// send data to TX
-				telemetry_link = 1;
-				scan_tlm_index = 0;
+			rssi = Scanner_scan_rssi();
+			if(rssi >= max_rssi) {
+				max_rssi = rssi;
+				pkt[scan_tlm_index] = rssi;
+			}
+			max_count++;
+			if(max_count > SCAN_MAX_COUNT) {
+				phase = SCAN_CHANNEL_CHANGE;
+				if (scan_tlm_index == SCAN_CHANS_PER_PACKET)
+				{
+					// send data to TX
+					telemetry_link = 1;
+					scan_tlm_index = 0;
+				}
 			}
 	}
 	return SCAN_AVERAGE_INTVL;
@@ -124,6 +138,7 @@ uint16_t initScanner(void)
 {
 	rf_ch_num = SCAN_MAX_RADIOCHANNEL;
 	scan_tlm_index = 0;
+	telemetry_link = 0;
 	phase = SCAN_CHANNEL_CHANGE;
 	Scanner_cc2500_init();
 	CC2500_Strobe(CC2500_SRX);

Multiprotocol/Telemetry.ino

@@ -184,13 +184,26 @@ static void multi_send_status()
 	}
 #endif
 
+#ifdef FRSKYX_RX_TELEMETRY
+	void frskyx_rx_channels_frame()
+	{
+		#if defined MULTI_TELEMETRY
+				multi_send_header(MULTI_TELEMETRY_RX_CHANNELS, 26);
+		#else
+				Serial_write(0xAA);					// Telemetry packet
+		#endif
+		for (uint8_t i = 0; i < 26; i++)
+			Serial_write(pkt[i]);					// pps, rssi, ch start, ch count, 16x ch data
+	}
+#endif
+
 #ifdef AFHDS2A_FW_TELEMETRY
 	void AFHDSA_short_frame()
 	{
 		#if defined MULTI_TELEMETRY
-			multi_send_header(MULTI_TELEMETRY_AFHDS2A, 29);
+			multi_send_header(pkt[29]==0xAA?MULTI_TELEMETRY_AFHDS2A:MULTI_TELEMETRY_AFHDS2A_AC, 29);
 		#else
-			Serial_write(0xAA);						// Telemetry packet
+			Serial_write(pkt[29]);					// Telemetry packet 0xAA or 0xAC
 		#endif
 		for (uint8_t i = 0; i < 29; i++)			// RSSI value followed by 4*7 bytes of telemetry data
 			Serial_write(pkt[i]);
@@ -1019,6 +1032,15 @@ void TelemetryUpdate()
 		}
 	#endif
 
+	#if defined FRSKYX_RX_TELEMETRY
+		if (telemetry_link && protocol == PROTO_FRSKYX_RX)
+		{
+			frskyx_rx_channels_frame();
+			telemetry_link = 0;
+			return;
+		}
+	#endif
+
 		if((telemetry_link & 1 )&& protocol != PROTO_FRSKYX)
 		{	// FrSkyD + Hubsan + AFHDS2A + Bayang + Cabell + Hitec + Bugs + BugsMini + NCC1701
 			frsky_link_frame();

Multiprotocol/Validate.h

@@ -193,6 +193,7 @@
 	#undef	HITEC_CC2500_INO
 	#undef	XN297L_CC2500_EMU
 	#undef	SCANNER_CC2500_INO
+	#undef	FRSKYX_RX_CC2500_INO
 #endif
 #ifndef NRF24L01_INSTALLED
 	#undef	BAYANG_NRF24L01_INO
@@ -250,12 +251,20 @@
 	#undef MULTI_STATUS
 	#undef MULTI_TELEMETRY
 	#undef SCANNER_TELEMETRY
+	#undef SCANNER_CC2500_INO
+	#undef FRSKYX_RX_TELEMETRY
+	#undef FRSKYX_RX_CC2500_INO
 #else
-	#if defined MULTI_TELEMETRY && not defined INVERT_TELEMETRY
-		#warning MULTI_TELEMETRY has been defined but not INVERT_TELEMETRY. They should be both enabled for OpenTX telemetry and status to work.
+	#if defined(MULTI_TELEMETRY) && defined(MULTI_STATUS)
+		#error You should choose either MULTI_TELEMETRY or MULTI_STATUS but not both.
 	#endif
-	#if not defined(SCANNER_CC2500_INO)
+	#if not defined(SCANNER_CC2500_INO) || not defined(SCANNER_TELEMETRY)
 		#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
 	#endif
 	#if not defined(BAYANG_NRF24L01_INO)
 		#undef BAYANG_HUB_TELEMETRY
@@ -263,7 +272,7 @@
 	#if not defined(NCC1701_NRF24L01_INO)
 		#undef NCC1701_HUB_TELEMETRY
 	#endif
-	#if not ( defined(BUGS_A7105_INO) || defined(BUGSMINI_NRF24L01_INO) )
+	#if not defined(BUGS_A7105_INO) && not defined(BUGSMINI_NRF24L01_INO)
 		#undef BUGS_HUB_TELEMETRY
 	#endif
 	#if not defined(CABELL_NRF24L01_INO)
@@ -296,7 +305,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)
+	#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)
 		#undef TELEMETRY
 		#undef INVERT_TELEMETRY
 		#undef SPORT_POLLING

Multiprotocol/_Config.h

@@ -174,6 +174,7 @@
 #define	FRSKYD_CC2500_INO
 #define	FRSKYV_CC2500_INO
 #define	FRSKYX_CC2500_INO
+#define	FRSKYX_RX_CC2500_INO
 #define	HITEC_CC2500_INO
 #define	SCANNER_CC2500_INO
 #define	SFHSS_CC2500_INO
@@ -296,6 +297,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
 
 //SPORT_POLLING is an implementation of the same polling routine as XJT module for sport telemetry bidirectional communication.
 //This is useful for passing sport control frames from TX to RX(ex: changing Betaflight PID or VTX channels on the fly using LUA scripts with OpentX).
@@ -547,6 +549,9 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		CH_8
 		EU_16
 		EU_8
+	PROTO_FRSKYX_RX
+		FRSKYX_FCC
+		FRSKYX_LBT
 	PROTO_FY326
 		FY326
 		FY319

Protocols_Details.md

@@ -84,11 +84,12 @@ CFlie|38|CFlie||||||||NRF24L01|
 [ESky150](Protocols_Details.md#ESKY150---35)|35|ESKY150||||||||NRF24L01|
 [Flysky](Protocols_Details.md#FLYSKY---1)|1|Flysky|V9x9|V6x6|V912|CX20||||A7105|
 [Flysky AFHDS2A](Protocols_Details.md#FLYSKY-AFHDS2A---28)|28|PWM_IBUS|PPM_IBUS|PWM_SBUS|PPM_SBUS|||||A7105|
-[Flyzone](Protocols_Details.md#FLYZONE---53)|53|Flyzone|FZ410|||||||A7105|
+[Flyzone](Protocols_Details.md#FLYZONE---53)|53|FZ410||||||||A7105|
 [FQ777](Protocols_Details.md#FQ777---23)|23|FQ777||||||||NRF24L01|SSV7241
 [FrskyD](Protocols_Details.md#FRSKYD---3)|3|FrskyD||||||||CC2500|
 [FrskyV](Protocols_Details.md#FRSKYV---25)|25|FrskyV||||||||CC2500|
 [FrskyX](Protocols_Details.md#FRSKYX---15)|15|CH_16|CH_8|EU_16|EU_8|||||CC2500|
+[FrskyX_RX](Protocols_Details.md#FRSKYX_RX---55)|55|FCC|EU_LBT|||||CC2500|
 [FY326](Protocols_Details.md#FY326---20)|20|FY326|FY319|||||||NRF24L01|
 [GD00X](Protocols_Details.md#GD00X---47)|47|GD_V1*|GD_V2*|||||||NRF24L01|
 [GW008](Protocols_Details.md#GW008---32)|32|GW008||||||||NRF24L01|XN297
@@ -113,7 +114,7 @@ CFlie|38|CFlie||||||||NRF24L01|
 [Shenqi](Protocols_Details.md#Shenqi---19)|19|Shenqi||||||||NRF24L01|LT8900
 [SLT](Protocols_Details.md#SLT---11)|11|SLT_V1|SLT_V2|Q100|Q200|MR100||||NRF24L01|
 [SymaX](Protocols_Details.md#Symax---10)|10|SYMAX|SYMAX5C|||||||NRF24L01|
-[Traxxas](Protocols_Details.md#Traxxas---43)|43|Traxxas|RX6519|||||||CYRF6936|
+[Traxxas](Protocols_Details.md#Traxxas---43)|43|RX6519||||||||CYRF6936|
 [V2x2](Protocols_Details.md#V2X2---5)|5|V2x2|JXD506|||||||NRF24L01|
 [V761](Protocols_Details.md#V761---48)|48|V761||||||||NRF24L01|XN297
 [V911S](Protocols_Details.md#V911S---46)|46|V911S*||||||||NRF24L01|XN297
@@ -341,6 +342,32 @@ CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8
 ---|---|---|---|---|---|---|---
 CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8
 
+## FRSKYX_RX - *55*
+The FrSkyX receiver protocol enables master/slave trainning, separate access from 2 different radios to the same model,...
+
+Extended limits supported
+
+Option for this protocol corresponds to fine frequency tuning.
+If the value is equal to 0, the RX will auto tune otherwise it will use the indicated value.
+This value is different for each Module and **must** be accurate otherwise the link will not be stable.
+Check the [Frequency Tuning page](/docs/Frequency_Tuning.md) to determine it.
+
+Low power: enable/disable the LNA stage on the RF component to use depending on the distance with the TX.
+
+### Sub_protocol FCC - *0*
+FCC protocol 8 or 16 channels.
+
+CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12|CH13|CH14|CH15|CH16
+---|---|---|---|---|---|---|---|---|----|----|----|----|----|----|----
+CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12|CH13|CH14|CH15|CH16
+
+### Sub_protocol EU_LBT - *1*
+EU_LBT protocol 8 or 16 channels.
+
+CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12|CH13|CH14|CH15|CH16
+---|---|---|---|---|---|---|---|---|----|----|----|----|----|----|----
+CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12|CH13|CH14|CH15|CH16
+
 ## HITEC - *39*
 Models: OPTIMA, MINIMA and MICRO receivers.
 
@@ -776,10 +803,16 @@ FMODE and AUX7 have 4 positions: -100%..-50%=>0, -50%..5%=>1, 5%..50%=>2, 50%..1
 
 ## FY326 - *20*
 
+### Sub_protocol FY326 - *0*
+Model: FY326 Q7 Quadcopter
+
 CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9
 ---|---|---|---|---|---|---|---|---
 A|E|T|R|FLIP|RTH|HEADLESS|EXPERT|CALIBRATE
 
+### Sub_protocol FY319 - *1*
+Model: X6 FY319 Quadcopter (Needs Testing)
+
 ## FQ777 - *23*
 Model: FQ777-124 (with SV7241A)
 

docs/Advanced_Debug.md

@@ -2,20 +2,18 @@
 
 To enable serial debug on your module you must know how to buid the firmware from the source code available on this GitHub. To do so follow this page: [Compiling and programming the STM32 module](Compiling_STM32.md).
 
-Procedure to use serial debug:
-1. Edit the file [Multiprotocol.ino](../Multiprotocol/Multiprotocol.ino#L26)
-1. Modify at the begining of the file the line: `//#define DEBUG_SERIAL` by removing the // leaving only: `#define DEBUG_SERIAL`
-1. Save the file
-1. Upload the firmware to the module:
+Procedure:
+1. Upload the debug firmware to the module:
+<img src="images/Debug1.png" />
 
 iRangeX+, Banggood and old Jumper 4in1 modules|Recent Jumper 4in1 modules with built-in CP2102|FTDI
 ----------------------------------------------|-----------------------------------------------|----
-Use the Upload method:"Upload via USB"|Use the Upload method: "Upload via Serial (FTDI)|Use the Upload method: "Upload via Serial (FTDI)
-Do not disconnect the USB cable. In case you have to do it, you have to connect the module, close and reopen the Serial Monitor to get the module working otherwise it will be stuck with the status LED off.|Do not disconnect the USB cable. In case you have to do it, you have to power first the TX and then connect the USB cable to the module and relaunch the Serial monitor.|No restrictions apart from relaunching the Serial monitor if you disconnect the FTDI from the PC
+Use the Debug Option: "Native USB Debugging"|Use the Debug Option: "Serial/FTDI Debugging"|Use the Debug Option: "Serial/FTDI Debugging"
+Do not disconnect the USB cable. In case you have to do it, you have to connect the module, close and reopen the Serial Monitor to get the module working otherwise the status LED will do a [Fast double blink](Troubleshooting.md).|Do not disconnect the USB cable. In case you have to do it, you have to power the TX first, then connect the USB cable to the module and relaunch the Serial monitor.|No restrictions apart from relaunching the Serial monitor if you disconnect the FTDI from the PC.
 
-5. Power on the TX
+2. Power on the TX
 1. Open in the Arduino IDE the Serial Monitor: Tools->Serial Monitor or Ctrl+Shift+M<br> <img src="images/Serial_Monitor_1.png" />
 1. Make sure the settings at the bottom of the Serial Monitor window are the same as the picture above especially the baud rate set to 115200 baud
 1. The Serial Monitor window should show the module booting, selection of a different protocol and more depending on the protocol currently loaded<br> <img src="images/Serial_Monitor_2.png" />
 1. At this stage you can test whatever is needed or have been instructed to do. You can easily select text in the window to copy and paste it on the forum or in a text file.
-1. **Important: to use your module normally and before flying you must reupload the firmware as you usually do with the debug line commented: `//#define DEBUG_SERIAL` **
+1. **Important: to use your module normally and before flying you must reupload the firmware as you usually do with the Debug Option set to "None"**

docs/Compiling_STM32.md

@@ -1,25 +1,25 @@
 # Compiling and Flashing (STM32)
 
-Multiprotocol modules can be flashed with a precompiled firmware file (Option 1) or you can compile and upload your customized firmware using the Arduino IDE (Option 2).
+Multiprotocol modules can be flashed with a precompiled firmware file (Option 1 and 2) or you can compile and upload your customized firmware using the Arduino IDE (Option 3).
 
 **These instructions are for the STM32 version of the Multiprotocol module.**  If you are Compling for the Arduino ATmega328p version of the Multiprotocol Module please go to the dedicated [ATmega328](Compiling.md) page.
 
 ## Index
 1. [Tools Required](#tools-required)
-1. [Option 1 - Update firmware using precompiled binaries](#option-1-update-firmware-using-precompiled-binaries)
-1. [Option 2 - Compiling and updating firmware](#option-2-compiling-and-updating-firmware)
+1. [Option 1 - Update firmware using precompiled binaries](#option-1---update-firmware-using-precompiled-binaries)
+1. [Option 2 - Flash from TX](#option-2---flash-from-tx)
+1. [Option 3 - Compiling and updating firmware](#option-3---compiling-and-updating-firmware)
    1. [Preparation](#preparation)
    1. [Install the Arduino IDE](#install-the-arduino-ide)
    1. [Download the Multiprotocol source and open the project](#download-the-multiprotocol-source-and-open-the-project)
    1. [Install the Multi 4-in-1 board](#install-the-multi-4-in-1-board)
    1. [Configure the Arduino IDE](#configure-the-arduino-ide)
-1. [Configure the firmware](#configure-the-firmware)
-1. [Verify the firmware](#verify-the-firmware)
-1. [Connect the module](#connect-the-module)
+   1. [Configure the firmware](#configure-the-firmware)
+   1. [Verify the firmware](#verify-the-firmware)
+   1. [Connect the module](#connect-the-module)
    1. [USB Port](#usb-port)
    1. [USB-to-Serial adapter](#usb-to-serial-adapter)
-1. [Upload the firmware](#upload-the-firmware)
-1. [Exporting compiled firmware](exporting-compiled-firmware)
+   1. [Upload the firmware](#upload-the-firmware)
 1. [Troubleshooting](#troubleshooting)
 
 ## Tools required
@@ -67,10 +67,17 @@ If you don't need/want to customize the multi module firmware then you can use p
   <img src="https://github.com/benlye/flash-multi/raw/master/img/flash-multi.jpg">
 </p>
 
-After a succesful flash your Module is now updated to the newer version firmware using the most common options. To change specific configured options you would need to use Option-2, Compile and flash update using Arduino IDE. 
+After a succesful flash your Module is now updated to the newer version firmware using the most common options. To change specific configured options you would need to use [Option-3](#option-3---compiling-and-updating-firmware), Compile using Arduino IDE and your desired upload method. 
  
-# Option2 - Compiling and Updating Firmware
-## Preparation
+## Option 2 - Flash from TX
+1. If you don't need/want to customize the multi module firmware then you can use pre-compiled binaries available [here](https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/releases).
+2. If you are compiling the firmware yourself in the Arduino environment with [Option-3](#option-3---compiling-and-updating-firmware), do the following to export the binary:
+- Click **Sketch -> Export compiled Binary**, or press **Ctrl+Alt+S**
+- Locate the file named **multi-stm-x.x.x.x.bin** in the **Multiprotocol source folder** folder (x.x.x.x is the multi version)
+3. Follow the instructions [here](/docs/Flash_from_Tx.md) to upload the firmware using your radio
+
+## Option 3 - Compiling and Updating Firmware
+### Preparation
 Multiprotocol firmware can be compiled and flashed with your customized firmware using the Arduino IDE. The guide below will walk you through all the steps in many details, don't be afraid by the length it is in fact simple!
 
 ### Install the Arduino IDE
@@ -90,14 +97,14 @@ Multiprotocol firmware can be compiled and flashed with your customized firmware
 1. Under **Tools -> Board** select **Multi 4-in-1 (STM32FC103)**
 1. Under **Tools -> Debug Option** select **None**
 
-## Configure the firmware
+### Configure the firmware
 Make any changes you require to the firmware.
 
 The STM32 module has more than enough flash space for all the available protocols so, unlike the Atmega328p-based module, it is not necessary to disable unused protocols.
 
 You can still disable protocols if you wish, and you may also enable or disable other optional Multiprotocol features.
 
-## Verify the firmware
+### Verify the firmware
 To check that the program will compile correctly and fit in the STM32 click **Sketch -> Verify/Compile**, or press **Ctrl+R**.
 
 If there are errors, carefully read it, go to the line number indicated and correct your typo.
@@ -109,15 +116,15 @@ Global variables use 4064 bytes (19%) of dynamic memory, leaving 16416 bytes for
 ```
 You can proceed to the next step.
 
-## Connect the module
-### USB port
+### Connect the module
+#### USB port
 Ensure that you [installed the necessary drivers](https://github.com/benlye/DIY-Multiprotocol-TX-Module/blob/doc-updates/docs/Arduino_IDE_Boards.md#install-device-drivers).
 
 If your Multiprotocol module has a USB port, connect it to the computer.  With the drivers installed your computer should detect the module as a COM port.  If the device appears correctly (check in **Device Manager**) you can proceed to the next step and [upload the firmware](#upload-the-firmware).  If not, you will need to flash your module one time using a USB-to-serial adapter (also known as an FTDI adapter).
 
 **Note:** Some modules require external power in order for the USB port to work.  If your module does not power on with USB power alone, install it in the transmitter and switch the transmitter on.  It is generally safe for the module to recieve power from both USB and the transmitter.
 
-### USB-to-Serial adapter
+#### USB-to-Serial adapter
 It is **strongly** recommended that you power your module from the transmitter when flashing it using a USB-to-serial adapater. This ensures that the module cannot be inadvertently supplied with 5V, which will damage the RF modules. This guide assumes that you will follow that advice, and instructs you to leave the V+ pin on the USB-to-TTL adapter disconnected. You may choose to ignore that advice at your own risk!
 
 The wiring for the USB-to-TTL adapter is:
@@ -148,15 +155,10 @@ In order to flash the bootloader the **BOOT0** jumper must be installed connecti
 1. Install the **BOOT0** jumper as described above.
 1. Switch on the transmitter
 
-## Upload the firmware
+### Upload the firmware
 1. In the Arduino IDE click **Sketch -> Upload**, or press **Ctrl+U**
 
-## Exporting compiled firmware
-1. Click **Sketch -> Export compiled Binary**, or press **Ctrl+Alt+S**
-1. Locate the file named **multi-stm-x.x.x.x.bin** in the **Multiprotocol source folder** folder (x.x.x.x is the multi version)
-1. Follow the instructions [here](/docs/Flash_from_Tx.md) to upload the firmware using your radio
-
-## Troubleshooting
+# Troubleshooting
 You can report your problem using the [GitHub issue](https://github.com/midelic/DIY-Multiprotocol-TX-Module/issues) system or go to the [Main thread on RCGROUPS](http://www.rcgroups.com/forums/showthread.php?t=2165676) to ask your question.
 Please provide the following information: