Update Compiling.md

Lua_scripts/MultiChan.txt

@@ -232,4 +232,3 @@
 102,1,JIABAILE,Gyro,0,Speed,Light,Flash,ST_Tr
 103,0,H36,Std,1,Flip,HLess,RTH
 104,0,KAMTOM,Std,0,ST_Tr,TH_Tr,TH_DR
-105,0,Shenqi2,Std,1

Multiprotocol/DSM_cyrf6936.ino

@@ -462,7 +462,7 @@ uint16_t DSM_callback()
 						else
 							return DSM2_SFC_PERIOD - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY - DSM_READ_DELAY;
 					}
-					return 10900 - DSM_WRITE_DELAY - DSM_READ_DELAY;	//Was 11000 but the SR6200A needs 10900 to report telemetry correctly
+					return 11000 - DSM_WRITE_DELAY - DSM_READ_DELAY;
 				}
 			#endif
 			return 11000 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY - DSM_READ_DELAY;
@@ -470,15 +470,12 @@ uint16_t DSM_callback()
 		case DSM_CH2_READ_B:
 			//Read telemetry
 			rx_phase = CYRF_ReadRegister(CYRF_07_RX_IRQ_STATUS);
-			debug("ST1:%02X ",rx_phase);
 			if((rx_phase & 0x03) == 0x02)  					// RXC=1, RXE=0 then 2nd check is required (debouncing)
 				rx_phase |= CYRF_ReadRegister(CYRF_07_RX_IRQ_STATUS);
-			debug("ST2:%02X ",rx_phase);
 			if((rx_phase & 0x07) == 0x02)
 			{ // good data (complete with no errors)
 				CYRF_WriteRegister(CYRF_07_RX_IRQ_STATUS, 0x80);	// need to set RXOW before data read
 				length=CYRF_ReadRegister(CYRF_09_RX_COUNT);
-				debug("RX(%d)",length);
 				if(length>TELEMETRY_BUFFER_SIZE-2)
 					length=TELEMETRY_BUFFER_SIZE-2;
 				CYRF_ReadDataPacketLen(packet_in+1, length);
@@ -492,11 +489,8 @@ uint16_t DSM_callback()
 					}
 				#endif
 				packet_in[0]=CYRF_ReadRegister(CYRF_13_RSSI)&0x1F;// store RSSI of the received telemetry signal
-				//for(uint8_t i=0;i<length+1;i++)
-				//	debug(" %02X", packet_in[i]);
 				telemetry_link=1;
 			}
-			debugln("");
 			CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x20);		// Abort RX operation
 			if (phase == DSM_CH2_READ_A && (sub_protocol==DSM2_1F || sub_protocol==DSMX_1F) && num_ch < 8)	// 22ms mode
 			{

Multiprotocol/Kamtom_nrf24l01.ino

@@ -136,13 +136,10 @@ uint16_t KAMTOM_callback()
 				{
 					BIND_DONE;
 					if(packet_in[0] == 0xA0 && packet_in[14] == rx_tx_addr[2] && packet_in[15] == rx_tx_addr[3])
-					{//Good packet with our TXID
+					{
 						rx_tx_addr[0] = packet_in[9];
 						rx_tx_addr[1] = packet_in[10];
-						#ifdef KAMTOM_HUB_TELEMETRY
-							v_lipo1 = packet_in[1] == 0x03 ? 0x00:0xFF;		// low voltage
-							telemetry_link = 1;
-						#endif
+						//if(packet_in[1] == 0x03)		// low voltage
 					}
 					#if 0
 						for(uint8_t i=0; i < KAMTOM_PAYLOAD_SIZE; i++)
@@ -177,9 +174,6 @@ void KAMTOM_init()
 	bind_counter = KAMTOM_BIND_COUNT;
 	phase = KAMTOM_DATA;
 	hopping_frequency_no = 0;
-	#ifdef KAMTOM_HUB_TELEMETRY
-		RX_RSSI = 100;		// Dummy value
-	#endif
 }
 
 #endif

Multiprotocol/Kyosho3_cyrf6936.ino

@@ -112,10 +112,7 @@ void KYOSHO3_init()
 		debugln("RF CH: %02X",hopping_frequency[0]);
 	#endif
 
-	if(IS_BIND_IN_PROGRESS)
-		CYRF_ConfigRFChannel(0x04);
-	else
-		CYRF_ConfigRFChannel(hopping_frequency[0]);
+	CYRF_ConfigRFChannel(hopping_frequency[0]);
 	
 	bind_counter = 8217;
 	phase = 0;

Multiprotocol/Multi.txt

@@ -99,5 +99,4 @@
 100,YuXiang
 102,JIABAILE,STD,GYRO
 103,H36
-104,KAMTOM
-105,Shenqi2
+104,KAMTOM

Multiprotocol/Multi_Protos.ino

@@ -36,7 +36,6 @@ const char STR_MT99XX[]		="MT99XX";
 const char STR_MT99XX2[]	="MT99XX2";
 const char STR_MJXQ[]		="MJXq";
 const char STR_SHENQI[]		="Shenqi";
-const char STR_SHENQI2[]	="Shenqi2";
 const char STR_FY326[]		="FY326";
 const char STR_FUTABA[]		="Futaba";
 const char STR_J6PRO[]		="J6 Pro";
@@ -477,9 +476,6 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(SHENQI_NRF24L01_INO)
 		{PROTO_SHENQI,     STR_SHENQI,    NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    SHENQI_init,     SHENQI_callback     },
 	#endif
-	#if defined(SHENQI2_NRF24L01_INO)
-		{PROTO_SHENQI2,    STR_SHENQI2,   NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    SHENQI2_init,     SHENQI2_callback   },
-	#endif
 	#if defined(SKYARTEC_CC2500_INO)
 		{PROTO_SKYARTEC,   STR_SKYARTEC,  NO_SUBTYPE,            0, OPTION_RFTUNE,  0, 1, SW_CC2500, SKYARTEC_init,   SKYARTEC_callback   },
 	#endif

Multiprotocol/Multiprotocol.h

@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	4
-#define VERSION_PATCH_LEVEL	42
+#define VERSION_PATCH_LEVEL	34
 
 #define MODE_SERIAL 0
 
@@ -132,7 +132,6 @@ enum PROTOCOLS
 	PROTO_JIABAILE	= 102,	// =>NRF24L01
 	PROTO_H36		= 103,	// =>NRF24L01
 	PROTO_KAMTOM	= 104,	// =>NRF24L01
-	PROTO_SHENQI2	= 105,	// =>NRF24L01
 	
 	PROTO_NANORF	= 126,	// =>NRF24L01
 	PROTO_TEST		= 127,	// =>CC2500

Multiprotocol/SHENQI2_nrf24l01.ino

@@ -1,232 +0,0 @@
-/*
- 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(SHENQI2_NRF24L01_INO)
-
-#include "iface_xn297.h"
-
-//#define FORCE_SHENQI2_ORIGINAL_ID
-
-#define SHENQI2_PAYLOAD_SIZE		8
-#define SHENQI2_RF_NUM_CHANNELS		16
-#define SHENQI2_BIND_COUNT			2000
-#define SHENQI2_WRITE_TIME			650
-#define SHENQI2_BIND_CHANNEL		44
-#define SHENQI2_PACKET_PERIOD		8210
-
-
-enum {
-	SHENQI2_BIND = 0,
-	SHENQI2_BIND_RX,
-	SHENQI2_DATA,
-};
-
-static void __attribute__((unused)) SHENQI2_send_packet()
-{
-	if(bind_counter)
-	{
-		bind_counter--;
-		if(!bind_counter)
-			BIND_DONE;
-	}
-
-	memset(packet, 0x00, SHENQI2_PAYLOAD_SIZE);
-
-	packet_count &= 0x0F;
-	packet[0] = packet_count;
-	
-	memcpy(&packet[1],rx_tx_addr,5);
-
-	if(IS_BIND_DONE)
-	{//Normal
-		uint8_t val = convert_channel_8b(CH2);
-		if(val < 0x70)
-			val = 0x30;
-		else if(val < 0x80)
-			val = 0x00;
-		else
-		{
-			val &= 0x7F;
-			val >>= 2;
-		}
-		if(Channel_data[CH1] > 1024+50)
-			val |= 0x40;
-		else if(Channel_data[CH1] < 1024-50)
-			val |= 0x80;
-		packet[6] = val;
-		//packet[7] = 0x00;		// ??
-	}
-	else
-		packet[0] |= 0x30;
-
-	// Send
-	XN297_SetPower();
-	XN297_SetTxRxMode(TX_EN);
-	XN297_WriteEnhancedPayload(packet, SHENQI2_PAYLOAD_SIZE, false);
-	#ifdef DEBUG_SERIAL
-		for(uint8_t i=0; i < SHENQI2_PAYLOAD_SIZE; i++)
-			debug("%02X ", packet[i]);
-		debugln();
-	#endif
-}
-
-static void __attribute__((unused)) SHENQI2_initialize_txid()
-{
-	#ifdef FORCE_SHENQI2_ORIGINAL_ID
-		//TXID
-		rx_tx_addr[0] = 0x51;
-		rx_tx_addr[1] = 0x70;
-		rx_tx_addr[2] = 0x02;
-		//RXID
-		rx_tx_addr[3] = 0x46;
-		rx_tx_addr[4] = 0xBE;
-	#endif
-	rx_tx_addr[3] = 0x00;
-	rx_tx_addr[4] = 0x00;
-	//Freq
-	memcpy(hopping_frequency,(uint8_t*)"\x05\x09\x0E\x0F\x17\x1C\x21\x27\x2A\x2C\x33\x39\x3D\x42\x48\x4C",16);
-}
-
-static void __attribute__((unused)) SHENQI2_RF_init()
-{
-	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
-	//Address
-	XN297_SetTXAddr((uint8_t*)"\x74\xD1\x3A\xF5\x6C", 5);
-	XN297_SetRXAddr((uint8_t*)"\x74\xD1\x3A\xF5\x6C", SHENQI2_PAYLOAD_SIZE);
-	XN297_RFChannel(SHENQI2_BIND_CHANNEL);
-}
-
-uint16_t SHENQI2_callback()
-{
-	static bool rx=false;
-	
-	switch(phase)
-	{
-		case SHENQI2_BIND:
-			rx = XN297_IsRX();
-			XN297_SetTxRxMode(TXRX_OFF);
-			SHENQI2_send_packet();
-			packet_count++;
-			if(rx)
-			{
-				uint8_t val=XN297_ReadEnhancedPayload(packet_in, SHENQI2_PAYLOAD_SIZE);
-				if(val == SHENQI2_PAYLOAD_SIZE)
-				{
-					if(memcmp(rx_tx_addr, packet_in, 3) == 0)
-					{//Good packet with our TXID
-						BIND_DONE;
-						rx_tx_addr[3] = packet_in[3];
-						rx_tx_addr[4] = packet_in[4];
-						packet_count = 0;
-						phase = SHENQI2_DATA;
-					}
-					#ifdef DEBUG_SERIAL
-						for(uint8_t i=0; i < SHENQI2_PAYLOAD_SIZE; i++)
-							debug(" %02X", packet_in[i]);
-						debugln();
-					#endif
-				}
-			}
-			phase++;
-			return SHENQI2_WRITE_TIME;
-		case SHENQI2_BIND_RX:
-			XN297_SetTxRxMode(TXRX_OFF);
-			XN297_SetTxRxMode(RX_EN);
-			phase = SHENQI2_BIND;
-			return SHENQI2_PACKET_PERIOD - SHENQI2_WRITE_TIME;
-		default: //SHENQI2_DATA
-			//Since I don't know the order of the channels, I'm hopping on all the channels quickly
-			//Refresh rate from the motorcycle perspective is 32ms instead of 8ms...
-			XN297_Hopping(hopping_frequency_no);
-			hopping_frequency_no++;
-			hopping_frequency_no &= 0x0F;
-			SHENQI2_send_packet();
-			if(hopping_frequency_no%4 == 0)
-				packet_count++;
-			return SHENQI2_PACKET_PERIOD/4;
-	}
-	return 0;
-}
-
-void SHENQI2_init()
-{
-	BIND_IN_PROGRESS;
-	SHENQI2_initialize_txid();
-	SHENQI2_RF_init();
-
-	bind_counter = SHENQI2_BIND_COUNT;
-	phase = SHENQI2_BIND;
-	hopping_frequency_no = 0;
-}
-
-#endif
-/*
-XN297 1Mb Enhanced,Acked,Scrambled
-
-Bind
----
-RX on channel: 44, Time:  2890us P: 34 51 70 02 00 00 00 00
-RX on channel: 44, Time:  1780us P: 34 51 70 02 00 00 00 00
-RX on channel: 44, Time:  1773us P: 34 51 70 02 00 00 00 00
-RX on channel: 44, Time:  1772us P: 34 51 70 02 00 00 00 00
-RX on channel: 44, Time:  2889us P: 35 51 70 02 00 00 00 00
-RX on channel: 44, Time:  1769us P: 35 51 70 02 00 00 00 00
-RX on channel: 44, Time:  1774us P: 35 51 70 02 00 00 00 00
-RX on channel: 44, Time:  1771us P: 35 51 70 02 00 00 00 00
-RX on channel: 44, Time:  2894us P: 36 51 70 02 00 00 00 00
-
-A= 74 D1 3A F5 6C
-RF:44
-Timing: 1772µs between the same 4 packets, 2892µs to the next packet, 8208µs between 2 packets
-Request ack, if no ack repeat the packet 4 times
-
-P[0] = counter 00..0F | 30 bind
-P[1] = TXID[0]
-P[2] = TXID[1]
-P[3] = TXID[2]
-P[4] = RXID[0]
-P[5] = RXID[1]
-P[6] = TH 00..1F, Break 30, 40 ST_right, 80 ST_left
-P[7] = 00?
-
-Answer from motorcycle:
-P: 51 70 02 46 BE 00 00 00
-P[0] = TXID[0]
-P[1] = TXID[1]
-P[2] = TXID[2]
-P[3] = RXID[0]
-P[4] = RXID[1]
-P[5] = 00
-P[6] = 00
-P[7] = 00
-
-Normal packets
----
-A= 74 D1 3A F5 6C
-RF:5,9,14,15,23,28,33,39,42,44,51,57,61,66,72,76
-RF:\x05\x09\x0E\x0F\x17\x1C\x21\x27\x2A\x2C\x33\x39\x3D\x42\x48\x4C
-- order of the channels is unknown and vary over time
-- send 16 times on each channel and switch (counter 00..0F)
-Timing:1772µs between the same 4 packets, 2892µs to the next packet, 8208µs between 2 packets
-Timing:8208 between packets if acked
-P: 00 51 70 02 46 BE 00 00
-P[0] = counter 00..0F
-P[1] = TXID[0]
-P[2] = TXID[1]
-P[3] = TXID[2]
-P[4] = RXID[0]
-P[5] = RXID[1]
-P[6] = TH 00..1F, Break 30, 40 ST_right, 80 ST_left
-P[7] = 00?
-*/

Multiprotocol/SLT_ccnrf.ino

@@ -19,7 +19,6 @@
 #include "iface_nrf250k.h"
 
 //#define SLT_Q200_FORCE_ID
-//#define SLT_V1_4_FORCE_ID
 
 // For code readability
 #define SLT_PAYLOADSIZE_V1		7
@@ -74,12 +73,12 @@ static void __attribute__((unused)) SLT_set_freq(void)
 	}
 
 	// Unique freq
-	uint8_t max_freq = 0x50;	//V1 and V2
-	if(sub_protocol == Q200)
+	uint8_t max_freq=0x50;	//V1 and V2
+	if(sub_protocol==Q200)
 		max_freq=45;
 	for (uint8_t i = 0; i < SLT_NFREQCHANNELS; ++i)
 	{
-		if(sub_protocol == Q200 && hopping_frequency[i] >= max_freq)
+		if(sub_protocol==Q200 && hopping_frequency[i] >= max_freq)
 			hopping_frequency[i] = hopping_frequency[i] - max_freq + 0x03;
 		uint8_t done = 0;
 		while (!done)
@@ -95,15 +94,15 @@ static void __attribute__((unused)) SLT_set_freq(void)
 				}
 		}
 	}
-	#ifdef DEBUG_SERIAL
+	#if 0
 		debug("CH:");
 		for (uint8_t i = 0; i < SLT_NFREQCHANNELS; ++i)
-			debug(" %02X(%d)", hopping_frequency[i], hopping_frequency[i]);
+			debug(" %02X", hopping_frequency[i]);
 		debugln();
 	#endif
 	
 	//Bind channel
-	hopping_frequency[SLT_NFREQCHANNELS] = SLT_BIND_CHANNEL;
+	hopping_frequency[SLT_NFREQCHANNELS]=SLT_BIND_CHANNEL;
 	
 	//Calib all channels
 	NRF250K_HoppingCalib(SLT_NFREQCHANNELS+1);
@@ -154,38 +153,35 @@ static void __attribute__((unused)) SLT_build_packet()
 
 	//->V1 stops here
 
-	if(sub_protocol == Q200)
+	if(sub_protocol==Q200)
 		packet[6] =  GET_FLAG(CH9_SW , FLAG_Q200_FMODE)
 					|GET_FLAG(CH10_SW, FLAG_Q200_FLIP)
 					|GET_FLAG(CH11_SW, FLAG_Q200_VIDON)
 					|GET_FLAG(CH12_SW, FLAG_Q200_VIDOFF);
-	else if(sub_protocol == MR100 || sub_protocol == Q100)
+	else if(sub_protocol==MR100 || sub_protocol==Q100)
 		packet[6] =  GET_FLAG(CH9_SW , FLAG_MR100_FMODE)
 					|GET_FLAG(CH10_SW, FLAG_MR100_FLIP)
 					|GET_FLAG(CH11_SW, FLAG_MR100_VIDEO)	// Does not exist on the Q100 but...
 					|GET_FLAG(CH12_SW, FLAG_MR100_PICTURE);	// Does not exist on the Q100 but...
-	packet[7] = convert_channel_8b(CH7);
-	packet[8] = convert_channel_8b(CH8);
-	if(sub_protocol == RF_SIM)
-	{
-		packet[9]  = convert_channel_8b(CH9);
-		packet[10] = convert_channel_8b(CH10);
-	}
-	else
-	{
-		packet[9]  = 0xAA;		//normal mode for Q100/Q200, unknown for V2/MR100
-		packet[10] = 0x00;		//normal mode for Q100/Q200, unknown for V2/MR100
-	}
-	if((sub_protocol == Q100 || sub_protocol == Q200) && CH13_SW)
+	packet[7]=convert_channel_8b(CH7);
+	packet[8]=convert_channel_8b(CH8);
+  if(sub_protocol==RF_SIM) {
+    packet[9]=convert_channel_8b(CH9);
+    packet[10]=convert_channel_8b(CH10);
+  } else {
+    packet[9]=0xAA;       //normal mode for Q100/Q200, unknown for V2/MR100
+    packet[10]=0x00;      //normal mode for Q100/Q200, unknown for V2/MR100
+  }
+	if((sub_protocol==Q100 || sub_protocol==Q200) && CH13_SW)
 	{//Calibrate
-		packet[9] = 0x77;			//enter calibration
-		if(calib_counter >= 20 && calib_counter <= 25)	// 7 packets for Q100 / 3 packets for Q200
-			packet[10] = 0x20;	//launch calibration
+		packet[9]=0x77;			//enter calibration
+		if(calib_counter>=20 && calib_counter<=25)	// 7 packets for Q100 / 3 packets for Q200
+			packet[10]=0x20;	//launch calibration
 		calib_counter++;
-		if(calib_counter > 250) calib_counter = 250;
+		if(calib_counter>250) calib_counter=250;
 	}
 	else
-		calib_counter = 0;
+		calib_counter=0;
 }
 
 static void __attribute__((unused)) SLT_send_bind_packet()
@@ -196,8 +192,8 @@ static void __attribute__((unused)) SLT_send_bind_packet()
 	NRF250K_SetPower();
 	BIND_DONE;
 	NRF250K_SetTXAddr((uint8_t *)"\x7E\xB8\x63\xA9", SLT_TXID_SIZE);
-	memcpy((void*)packet, (void*)rx_tx_addr, SLT_TXID_SIZE);
-	if(phase == SLT_BIND2)
+	memcpy((void*)packet,(void*)rx_tx_addr,SLT_TXID_SIZE);
+	if(phase==SLT_BIND2)
 		SLT_send_packet(SLT_TXID_SIZE);
 	else // SLT_BIND1
 		SLT_send_packet(SLT_PAYLOADSIZE_V2);
@@ -228,9 +224,9 @@ uint16_t SLT_callback()
 		case SLT_DATA2:
 			phase++;
 			SLT_send_packet(packet_length);
-			if(sub_protocol == SLT_V1)
+			if(sub_protocol==SLT_V1)
 				return SLT_V1_TIMING_PACKET;
-			if(sub_protocol == SLT_V1_4)
+			if(sub_protocol==SLT_V1_4)
 			{
 				phase++;						//Packets are sent two times only
 				return SLT_V1_4_TIMING_PACKET;
@@ -242,24 +238,24 @@ uint16_t SLT_callback()
 			if (++packet_count >= 100)
 			{// Send bind packet
 				packet_count = 0;
-				if(sub_protocol == SLT_V1 || sub_protocol == SLT_V1_4)
+				if(sub_protocol==SLT_V1||sub_protocol==SLT_V1_4)
 				{
-					phase = SLT_BIND2;
+					phase=SLT_BIND2;
 					return SLT_V1_TIMING_BIND2;
 				}
 				//V2
-				phase = SLT_BIND1;
+				phase=SLT_BIND1;
 				return SLT_V2_TIMING_BIND1;
 			}
 			else
 			{// Continue to send normal packets
 				phase = SLT_BUILD;
-				if(sub_protocol == SLT_V1)
-					return 20000 - SLT_TIMING_BUILD;
+				if(sub_protocol==SLT_V1)
+					return 20000-SLT_TIMING_BUILD;
 				if(sub_protocol==SLT_V1_4)
-					return 18000 - SLT_TIMING_BUILD - SLT_V1_4_TIMING_PACKET;
+					return 18000-SLT_TIMING_BUILD-SLT_V1_4_TIMING_PACKET;
 				//V2
-				return 13730 - SLT_TIMING_BUILD;
+				return 13730-SLT_TIMING_BUILD;
 			}
 		case SLT_BIND1:
 			SLT_send_bind_packet();
@@ -268,12 +264,12 @@ uint16_t SLT_callback()
 		case SLT_BIND2:
 			SLT_send_bind_packet();
 			phase = SLT_BUILD;
-			if(sub_protocol == SLT_V1)
-				return 20000 - SLT_TIMING_BUILD - SLT_V1_TIMING_BIND2;
-			if(sub_protocol == SLT_V1_4)
-				return 18000 - SLT_TIMING_BUILD - SLT_V1_TIMING_BIND2 - SLT_V1_4_TIMING_PACKET;
+			if(sub_protocol==SLT_V1)
+				return 20000-SLT_TIMING_BUILD-SLT_V1_TIMING_BIND2;
+			if(sub_protocol==SLT_V1_4)
+				return 18000-SLT_TIMING_BUILD-SLT_V1_TIMING_BIND2-SLT_V1_4_TIMING_PACKET;
 			//V2
-			return 13730 - SLT_TIMING_BUILD - SLT_V2_TIMING_BIND1 - SLT_V2_TIMING_BIND2;
+			return 13730-SLT_TIMING_BUILD-SLT_V2_TIMING_BIND1-SLT_V2_TIMING_BIND2;
 	}
 	return 19000;
 }
@@ -284,36 +280,7 @@ void SLT_init()
 	packet_count = 0;
 	packet_sent = 0;
 	hopping_frequency_no = 0;
-
-	if(sub_protocol == SLT_V1)
-	{
-		packet_length = SLT_PAYLOADSIZE_V1;
-		#ifdef MULTI_SYNC
-			packet_period = 20000+2*SLT_V1_TIMING_PACKET;		//22ms
-		#endif
-	}
-	else if(sub_protocol == SLT_V1_4)
-	{
-		packet_length = SLT_PAYLOADSIZE_V1_4;
-		#ifdef MULTI_SYNC
-			packet_period = 18000;								//18ms
-		#endif
-		 //Force high part of the ID otherwise the RF frequencies do not match, only tested the 2 last bytes...
-		rx_tx_addr[0]=0xF4;
-		rx_tx_addr[1]=0x71;
-		#ifdef SLT_V1_4_FORCE_ID	// ID taken from TX dumps
-			memcpy(rx_tx_addr,"\xF4\x71\x8D\x01",SLT_TXID_SIZE);
-		#endif
-	}
-	else //V2
-	{
-		packet_length = SLT_PAYLOADSIZE_V2;
-		#ifdef MULTI_SYNC
-			packet_period = 13730+2*SLT_V2_TIMING_PACKET;		//~18ms
-		#endif
-	}
-
-	if(sub_protocol == Q200)
+	if(sub_protocol==Q200)
 	{ //Q200: Force high part of the ID otherwise it won't bind
 		rx_tx_addr[0]=0x01;
 		rx_tx_addr[1]=0x02;
@@ -322,11 +289,34 @@ void SLT_init()
 		/*	rx_tx_addr[0]=0x01;rx_tx_addr[1]=0x02;rx_tx_addr[2]=0x0B;rx_tx_addr[3]=0x57;*/
 		#endif
 	}
-
 	SLT_RF_init();
 	SLT_set_freq();
-
 	phase = SLT_BUILD;
+	if(sub_protocol==SLT_V1)
+	{
+		packet_length = SLT_PAYLOADSIZE_V1;
+		#ifdef MULTI_SYNC
+			packet_period = 20000+2*SLT_V1_TIMING_PACKET;		//22ms
+		#endif
+	}
+	else if(sub_protocol==SLT_V1_4)
+	{
+		packet_length = SLT_PAYLOADSIZE_V1_4;
+		#ifdef MULTI_SYNC
+			packet_period = 18000;								//18ms
+		#endif
+		//Test IDs
+		MProtocol_id = MProtocol_id_master ^ (1<<RX_num);
+		set_rx_tx_addr(MProtocol_id);
+		debugln("Try ID: %lx", MProtocol_id);
+	}
+	else //V2
+	{
+		packet_length = SLT_PAYLOADSIZE_V2;
+		#ifdef MULTI_SYNC
+			packet_period = 13730+2*SLT_V2_TIMING_PACKET;		//~18ms
+		#endif
+	}
 }
 
 #endif

Multiprotocol/Validate.h

@@ -337,7 +337,6 @@
 	#undef	REALACC_NRF24L01_INO
 	#undef	SGF22_NRF24L01_INO
 	#undef	SHENQI_NRF24L01_INO
-	#undef	SHENQI2_NRF24L01_INO
 	#undef	SYMAX_NRF24L01_INO
 	#undef	V2X2_NRF24L01_INO
 	#undef	V761_NRF24L01_INO
@@ -393,7 +392,6 @@
 	#undef	KYOSHO3_CYRF6936_INO
 	#undef	MOULDKG_NRF24L01_INO
 	#undef	SHENQI_NRF24L01_INO
-	#undef	SHENQI2_NRF24L01_INO
 	#undef	JIABAILE_NRF24L01_INO
 	#undef	UDIRC_CCNRF_INO
 	#undef	KAMTOM_NRF24L01_INO
@@ -492,7 +490,6 @@
 	#undef PROPEL_HUB_TELEMETRY
 	#undef OMP_HUB_TELEMETRY
 	#undef V761_HUB_TELEMETRY
-	#undef KAMTOM_HUB_TELEMETRY
 	#undef YUXIANG_HUB_TELEMETRY
 	#undef RLINK_HUB_TELEMETRY
 	#undef DSM_RX_CYRF6936_INO
@@ -532,9 +529,6 @@
 	#if not defined(V761_NRF24L01_INO)
 		#undef V761_HUB_TELEMETRY
 	#endif
-	#if not defined(KAMTOM_NRF24L01_INO)
-		#undef KAMTOM_HUB_TELEMETRY
-	#endif
 	#if not defined(YUXIANG_NRF24L01_INO)
 		#undef YUXIANG_HUB_TELEMETRY
 	#endif
@@ -595,7 +589,7 @@
 		//protocols using FRSKYD user frames
 		#undef HUB_TELEMETRY 
 	#endif
-	#if not defined(HOTT_FW_TELEMETRY) && 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(RLINK_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) && not defined(AFHDS2A_RX_TELEMETRY) && not defined(BAYANG_RX_TELEMETRY) && not defined(DEVO_HUB_TELEMETRY) && not defined(PROPEL_HUB_TELEMETRY) && not defined(OMP_HUB_TELEMETRY) && not defined(V761_HUB_TELEMETRY) && not defined(KAMTOM_HUB_TELEMETRY) && not defined(YUXIANG_HUB_TELEMETRY) && not defined(WFLY2_HUB_TELEMETRY) && not defined(LOLI_HUB_TELEMETRY) && not defined(MLINK_HUB_TELEMETRY) && not defined(MLINK_FW_TELEMETRY) && not defined(MT99XX_HUB_TELEMETRY) && not defined(MULTI_CONFIG_INO)
+	#if not defined(HOTT_FW_TELEMETRY) && 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(RLINK_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) && not defined(AFHDS2A_RX_TELEMETRY) && not defined(BAYANG_RX_TELEMETRY) && not defined(DEVO_HUB_TELEMETRY) && not defined(PROPEL_HUB_TELEMETRY) && not defined(OMP_HUB_TELEMETRY) && not defined(V761_HUB_TELEMETRY) && not defined(YUXIANG_HUB_TELEMETRY) && not defined(WFLY2_HUB_TELEMETRY) && not defined(LOLI_HUB_TELEMETRY) && not defined(MLINK_HUB_TELEMETRY) && not defined(MLINK_FW_TELEMETRY) && not defined(MT99XX_HUB_TELEMETRY) && not defined(MULTI_CONFIG_INO)
 		#undef TELEMETRY
 		#undef INVERT_TELEMETRY
 		#undef MULTI_TELEMETRY

Multiprotocol/XK2_ccnrf.ino

@@ -200,7 +200,7 @@ uint16_t XK2_callback()
 			}
 			return 1000;
 		case XK2_DATA_PREP:
-			crc8 = eeprom_read_byte((EE_ADDR)(XK2_EEPROM_OFFSET+RX_num));
+			crc8=eeprom_read_byte((EE_ADDR)(XK2_EEPROM_OFFSET+RX_num));
 			debugln("R:RX_ID=%02X",crc8);
 			XN297_SetTxRxMode(TXRX_OFF);
 			XN297_SetTxRxMode(TX_EN);

Multiprotocol/_Config.h

@@ -257,7 +257,6 @@
 #define	REALACC_NRF24L01_INO
 #define	SGF22_NRF24L01_INO
 #define	SHENQI_NRF24L01_INO
-#define	SHENQI2_NRF24L01_INO
 #define	SYMAX_NRF24L01_INO
 #define	V2X2_NRF24L01_INO
 #define	V761_NRF24L01_INO
@@ -352,7 +351,6 @@
 #define NCC1701_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
 #define OMP_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
 #define V761_HUB_TELEMETRY			// Use FrSkyD Hub format to send telemetry to TX
-#define KAMTOM_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
 #define YUXIANG_HUB_TELEMETRY
 #define PROPEL_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
 #define CABELL_HUB_TELEMETRY		// Use FrSkyD Hub format to send telemetry to TX
@@ -836,8 +834,6 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
   		J20
 	PROTO_SHENQI
 		NONE
-	PROTO_SHENQI2
-		NONE
 	PROTO_SKYARTEC
 		NONE
 	PROTO_SLT

Protocols_Details.md

@@ -115,7 +115,6 @@ CFlie|38|CFlie||||||||NRF24L01|
 [JIABAILE](Protocols_Details.md#JIABAILE---102)|102|Std|Gyro|||||||NRF24L01|XN297
 [JJRC345](Protocols_Details.md#JJRC345---71)|71|JJRC345|SkyTmblr|||||||NRF24L01|XN297
 [JOYSWAY](Protocols_Details.md#JOYSWAY---84)|84|||||||||NRF24L01|XN297
-[KAMTOM](Protocols_Details.md#KAMTOM---104)|104|||||||||NRF24L01|XN297
 [KF606](Protocols_Details.md#KF606---49)|49|KF606|MIG320|ZCZ50||||||NRF24L01|XN297
 [KN](Protocols_Details.md#KN---9)|9|WLTOYS|FEILUN|||||||NRF24L01|
 [Kyosho](Protocols_Details.md#Kyosho---73)|73|FHSS|Hype|||||||A7105|
@@ -144,7 +143,6 @@ CFlie|38|CFlie||||||||NRF24L01|
 [Scorpio](Protocols_Details.md#Scorpio---94)|94|||||||||CYRF6936|
 [SGF22](Protocols_Details.md#SGF22---97)|97|F22|F22S|J20||||||NRF24L01|XN297
 [Shenqi](Protocols_Details.md#Shenqi---19)|19|Shenqi||||||||NRF24L01|LT8900
-[Shenqi2](Protocols_Details.md#Shenqi2---105)|105|Shenqi2||||||||NRF24L01|XN297
 [Skyartec](Protocols_Details.md#Skyartec---68)|68|||||||||CC2500|CC2500
 [SLT](Protocols_Details.md#SLT---11)|11|SLT_V1|SLT_V2|Q100|Q200|MR100|V1_4CH|RF_SIM||NRF24L01|CC2500
 [SymaX](Protocols_Details.md#Symax---10)|10|SYMAX|SYMAX5C|||||||NRF24L01|
@@ -1441,14 +1439,11 @@ FLIP: sets model into flip mode for approx 5 seconds at each throw of switch (re
 MODE: -100% level, +100% acro
 
 ### Sub_protocol V1_4CH - *5*
-Transmitters: SLT2 and SLT2 DLC, Receivers: SPMXSE2825RX, SPMXSBER1025G, SPMXSE4510RX, ...
 
 CH1|CH2|CH3|CH4
 ---|---|---|---
 CH1|CH2|CH3|CH4
 
-CH4 is used for DSC settings: -35% off to +15% full
-
 ### Sub_protocol RF_SIM - *6*
 Models: the SLT-dongle included in RealFlight 7.5
 
@@ -1987,13 +1982,13 @@ Model: DF-Models SkyTumbler
 RTH not supported
 
 ## KAMTOM - *104*
-Models: KAMTOM RC Racing KM24xx (KM32xx?), Pinecone SG-24xx
+Models: KAMTOM KM24xx (KM32xx?), Pinecone SG-24xx
 
 CH1|CH2|CH3|CH4|CH5|CH6|CH7
 ---|---|---|---|---|---|---
 ST|TH|UNK1|UNK2|ST_TR|TH_TR|TH_DR
 
-Low battery telemetry in A1 with 0 = low batt
+Low batt telemetry is not yet added.
 
 ## KYOSHO2 - *93*
 Model: TX KT-17, Minium Edge 540, Minium Citabria
@@ -2165,15 +2160,6 @@ CH1|CH2|CH3|CH4
 
 Throttle +100%=full forward,0%=stop,-100%=full backward.
 
-## Shenqi2 - *105*
-Autobind protocol
-
-Model: Shenqiwei 1/20 Mini Motorcycle
-
-CH1|CH2
----|---
-ST|TH
-
 ## Symax - *10*
 Autobind protocol