WFLY RF: WIP protocol

Multiprotocol/A7105_SPI.ino

@@ -107,7 +107,7 @@ void A7105_WriteID(uint32_t ida)
 {
 	A7105_CSN_off;
 	SPI_Write(A7105_06_ID_DATA);			//ex id=0x5475c52a ;txid3txid2txid1txid0
-	SPI_Write((ida>>24)&0xff);				//53 
+	SPI_Write((ida>>24)&0xff);				//54 
 	SPI_Write((ida>>16)&0xff);				//75
 	SPI_Write((ida>>8)&0xff);				//c5
 	SPI_Write((ida>>0)&0xff);				//2a
@@ -207,6 +207,11 @@ void A7105_AdjustLOBaseFreq(uint8_t cmd)
 					offset=(int16_t)FORCE_KYOSHO_TUNING;
 				#endif
 				break;
+			case PROTO_WFLYRF:
+				#ifdef FORCE_WFLYRF_TUNING
+					offset=(int16_t)FORCE_WFLYRF_TUNING;
+				#endif
+				break;
 			case PROTO_AFHDS2A:
 			case PROTO_AFHDS2A_RX:
 				#ifdef FORCE_AFHDS2A_TUNING
@@ -325,11 +330,11 @@ const uint8_t PROGMEM KYOSHO_HYPE_A7105_regs[] = {
 	0x01, 0x0f // 30 - 31
 };
 #endif
-#ifdef WFLYRF_A7105_INO
+#ifdef WFLYRF_A7105_INO //A7106 values
 const uint8_t PROGMEM WFLYRF_A7105_regs[] = {
-	0xff, 0x42, 0xff, 0x25, 0x00, 0xff, 0xff ,0x00, 0x00, 0x00, 0x00, 0x01, 0x21, 0x05, 0x00, 0x50,	// 00 - 0f
+	0xff, 0x62, 0xff, 0x1F, 0x40, 0xff, 0xff ,0x00, 0x00, 0x00, 0x00, 0x33, 0x33, 0x05, 0x00, 0x64,	// 00 - 0f Change: 0B&0C=0x33
-	0x9e, 0x4b, 0x00, 0x02, 0x16, 0x2b, 0x12, 0x40, 0x62, 0x80, 0x80, 0x00, 0x0a, 0x32, 0x03, 0x1f,	// 10 - 1f
+	0x9e, 0x4b, 0x00, 0x02, 0x16, 0x2b, 0x12, 0x40, 0x62, 0x80, 0x80, 0x00, 0x0a, 0x32, 0x03, 0x0f,	// 10 - 1f 1C=0x0A
-	0x1e, 0x00, 0x00, 0xff, 0x00, 0x00, 0x23, 0x70, 0x1F, 0x47, 0x80, 0x57, 0x01, 0x45, 0x19, 0x00,	// 20 - 2f
+	0x12, 0x00, 0x00, 0xff, 0x00, 0x00, 0x23, 0x70, 0x15, 0x47, 0x80, 0x03, 0x01, 0x45, 0x18, 0x00,	// 20 - 2f 2B=03, 2E=0x18
 	0x01, 0x0f // 30 - 31
 };
 #endif
@@ -341,6 +346,13 @@ void A7105_Init(void)
 	uint8_t *A7105_Regs=0;
     uint8_t vco_calibration0, vco_calibration1;
 	
+	#ifdef WFLYRF_A7105_INO
+		if(protocol==PROTO_WFLYRF)
+		{
+			A7105_Regs=(uint8_t*)WFLYRF_A7105_regs;
+		}
+		else
+	#endif
 	#ifdef HEIGHT_A7105_INO
 		if(protocol==PROTO_HEIGHT)
 		{
@@ -389,10 +401,6 @@ void A7105_Init(void)
 						A7105_Regs=(uint8_t*)KYOSHO_HYPE_A7105_regs;
 				}
 			#endif
-			#ifdef WFLYRF_A7105_INO
-				if(protocol==PROTO_WFLYRF)
-					A7105_Regs=(uint8_t*)WFLYRF_A7105_regs;
-			#endif
 		}
 
 	for (uint8_t i = 0; i < 0x32; i++)
@@ -410,7 +418,7 @@ void A7105_Init(void)
 			if(protocol==PROTO_HEIGHT && sub_protocol==HEIGHT_8CH)
 				if(i==0x03) val=0x0A;
 		#endif
-		if( val != 0xFF)
+		if( val != 0xff)
 			A7105_WriteReg(i, val);
 	}
 	A7105_Strobe(A7105_STANDBY);
@@ -454,7 +462,7 @@ void A7105_Init(void)
 		while(A7105_ReadReg(A7105_02_CALC));			// Wait for calibration to end
 		vco_calibration1 = A7105_ReadReg(A7105_25_VCO_SBCAL_I);
 
-		if(protocol==PROTO_BUGS)
+		if(protocol==PROTO_BUGS || protocol==PROTO_WFLYRF)
 			A7105_SetVCOBand(vco_calibration0 & 0x07, vco_calibration1 & 0x07);	// Set calibration band value to best match
 		else
 			if(protocol!=PROTO_HUBSAN)

Multiprotocol/Multiprotocol.h

@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	1
-#define VERSION_PATCH_LEVEL	79
+#define VERSION_PATCH_LEVEL	80
 
 //******************
 // Protocols

Multiprotocol/Multiprotocol.ino

@@ -1197,7 +1197,7 @@ static void protocol_init()
 						break;
 				#endif
 				#if defined(WFLYRF_A7105_INO)
-					case PROTO_WFLY:
+					case PROTO_WFLYRF:
 						PE1_off;	//antenna RF1
 						next_callback = initWFLYRF();
 						remote_callback = ReadWFLYRF;

Multiprotocol/Validate.h

@@ -160,6 +160,11 @@
 		#error "The Kyosho forced frequency tuning value is outside of the range -300..300."
 	#endif
 #endif
+#ifdef FORCE_WFLYRF_TUNING
+	#if ( FORCE_WFLYRF_TUNING < -300 ) || ( FORCE_WFLYRF_TUNING > 300 )
+		#error "The WFLYRF forced frequency tuning value is outside of the range -300..300."
+	#endif
+#endif
 
 #ifndef USE_A7105_CH15_TUNING
 	#ifndef FORCE_BUGS_TUNING
@@ -177,6 +182,9 @@
 	#ifndef FORCE_KYOSHO_TUNING
 		#define FORCE_KYOSHO_TUNING 0
 	#endif
+	#ifndef FORCE_WFLYRF_TUNING
+		#define FORCE_WFLYRF_TUNING 0
+	#endif
 	#ifndef FORCE_HUBSAN_TUNING
 		#define FORCE_HUBSAN_TUNING 0
 	#endif

Multiprotocol/WFLYRF_a7105.ino

@@ -21,131 +21,221 @@
 
 //WFLYRF constants & variables
 #define WFLYRF_BIND_COUNT		2500
+#define WFLYRF_PACKET_SIZE		32
 
-static void __attribute__((unused)) WFLYRF_send_packet()
+enum{
+	WFLYRF_BIND,
+	WFLYRF_DATA,
+	WFLYRF_PLL_TX,
+	WFLYRF_RX,
+};
+
+static void __attribute__((unused)) WFLYRF_send_bind_packet()
 {
+	//Header
+	packet[0] = 0x0F;			// Bind packet
+
 	//ID
-	packet[1] = rx_tx_addr[0];
+	packet[1] = rx_tx_addr[3];
-	packet[2] = rx_tx_addr[1];
+	packet[2] = rx_tx_addr[2];
-	packet[3] = rx_tx_addr[2];
+	packet[3] = rx_tx_addr[1];
-	packet[4] = rx_tx_addr[3];
-	//unknown may be RX ID on some other remotes
-	memset(packet+5,0xFF,4);
 
-	if(IS_BIND_IN_PROGRESS)
+	//Unknown
-	{
+	packet[4] = 0x00;
-		packet[ 0]  = 0xBC;						// bind indicator
+	packet[5] = 0x01;
-		packet[ 9] &= 0x01;
+
-		packet[ 9] ^= 0x01;						// high/ low part of the RF table
+	//Freq
-		packet[10]  = 0x00;
+	packet[6] = (hopping_frequency_no<<1)+0x0E;
-		//RF table
+	rf_ch_num = (hopping_frequency_no<<2)+0x2C;
-		for(uint8_t i=0; i<16;i++)
+	hopping_frequency_no++;	// not sure which frequencies are used since the dump only goes from 0x0E to 0x2C and stops...
-			packet[i+11]=hopping_frequency[i+(packet[9]<<4)];
+	if(hopping_frequency_no > 0x1A) hopping_frequency_no=0x00;
-		//unknwon
+
-		packet[27]  = 0x05;
+	//Unknown
-		packet[28]  = 0x00;
+	memset(&packet[7],0x00,25);
-		memset(packet+29,0xFF,8);
+
-		//frequency hop during bind
+	//Debug
-		if(packet[9])
-			rf_ch_num=0x8C;
-		else
-			rf_ch_num=0x0D;
-	}
-	else
-	{
-		packet[ 0]  = 0x58;						// normal packet
-		//14 channels: steering, throttle, ...
-		for(uint8_t i = 0; i < 14; i++)
-		{
-			uint16_t temp=convert_channel_ppm(i);
-			packet[9 + i*2]=temp&0xFF;			// low byte of servo timing(1000-2000us)
-			packet[10 + i*2]=(temp>>8)&0xFF;	// high byte of servo timing(1000-2000us)
-		}
-		rf_ch_num=hopping_frequency[hopping_frequency_no];
-		hopping_frequency_no++;
-		packet[34] |= (hopping_frequency_no&0x0F)<<4;
-		packet[36] |= (hopping_frequency_no&0xF0);		// last byte is ending with F on the dumps so let's see
-		hopping_frequency_no &= 0x1F;
-	}
 	#if 0
 		debug("ch=%02X P=",rf_ch_num);
-		for(uint8_t i=0; i<37; i++)
+		for(uint8_t i=0; i<WFLYRF_PACKET_SIZE; i++)
 			debug("%02X ", packet[i]);
 		debugln("");
 	#endif
-	A7105_WriteData(37, rf_ch_num);
+
+	//Send
+	A7105_WriteData(WFLYRF_PACKET_SIZE, rf_ch_num);
 }
 
+static void __attribute__((unused)) WFLYRF_build_packet()
+{
+	static uint16_t pseudo=0;
+
+	//Header
+	packet[0] = 0x00;	// Normal packet
+
+	//Pseudo
+	uint16_t high_bit=(pseudo & 0x8000) ^ 0x8000; 							// toggle 0x8000 every other line
+	pseudo <<= 1;															// *2
+	if( (pseudo & 0x8000) || pseudo == 0 ) pseudo ^= 0x8A87;				// Randomisation, pseudo==0 is a guess but would give the start value seen on the dump when P[2]P[1]=0 at init and will prevent a lock up
+	pseudo |= high_bit;														// include toggle
+	packet[1] = pseudo;
+	packet[2] = pseudo>>8;
+	
+	//RF channel
+	int8_t prev = rf_ch_num & 0x1F;
+	rf_ch_num = (pseudo ^ (pseudo >> 7)) & 0x57;
+	if(rf_ch_num & 0x10)
+	{
+		rf_ch_num |= 0x08;
+		rf_ch_num &= 0x4F;
+	}
+	if(rf_ch_num & 0x40)
+	{
+		rf_ch_num |= 0x10;
+		rf_ch_num &= 0x1F;
+	}
+	rf_ch_num ^= rx_tx_addr[3] & 0x1F;
+	if(abs((int8_t)rf_ch_num-prev) <= 9)
+	{
+		if(high_bit)
+			rf_ch_num |= 0x20;
+	}
+	else
+		if(!high_bit)
+			rf_ch_num |= 0x20;
+
+	//Partial ID
+	packet[3] = rx_tx_addr[3];
+	packet[4] = rx_tx_addr[2] & 0x1F;	//not sure... could be 0x1F down to 0x03
+
+	//10 channels
+	for(uint8_t i = 0; i < 5; i++)
+	{
+		uint16_t temp=convert_channel_16b_nolimit(i*2 , 0x0000, 0x0FFF);	// need to check channels min/max...
+		packet[5 + i*3]  = temp&0xFF;		// low byte
+		packet[7 + i*3]  = (temp>>8)&0x0F;	// high byte
+		temp=convert_channel_16b_nolimit(i*2+1, 0x0000, 0x0FFF);	// need to check channels min/max...
+		packet[6 + i*3]  = temp&0xFF;		// low byte
+		packet[7 + i*3] |= (temp>>4)&0xF0;	// high byte
+	}
+	
+	//Unknown
+	memset(&packet[20],0x00,12);
+
+	//Debug
+	#if 0
+		debug("ch=%02X,%02X P=",rf_ch_num,(rf_ch_num<<1)+0x10);
+		for(uint8_t i=0; i<WFLYRF_PACKET_SIZE; i++)
+			debug("%02X ", packet[i]);
+		debugln("");
+	#endif
+}
+
+#define WFLYRF_PACKET_PERIOD	3600 //3600
+#define WFLYRF_BUFFER_TIME		1500
+#define WFLYRF_WRITE_TIME		942 //942
+
 uint16_t ReadWFLYRF()
 {
+	uint16_t start;
 	#ifndef FORCE_WFLYRF_TUNING
 		A7105_AdjustLOBaseFreq(1);
 	#endif
-	if(IS_BIND_IN_PROGRESS)
+	switch(phase)
 	{
+		case WFLYRF_BIND:
 			bind_counter--;
 			if (bind_counter == 0)
 			{
 				BIND_DONE;
-			if(sub_protocol==WFLYRF_HYPE)
-			{
 				A7105_WriteID(MProtocol_id);
-				A7105_WriteReg(A7105_03_FIFOI,0x05);
+				rf_ch_num = 0;
+				phase++;	// WFLYRF_DATA
 			}
-		}
+			WFLYRF_send_bind_packet();
-	}
+			return WFLYRF_PACKET_PERIOD;
-	else
+
-	{
+		case WFLYRF_DATA:
-		if(hopping_frequency_no==0)
-			A7105_SetPower();
 			#ifdef MULTI_SYNC
-			telemetry_set_input_sync(packet_period);
+				telemetry_set_input_sync(WFLYRF_PACKET_PERIOD);
+			#endif
+			//Build packet
+			WFLYRF_build_packet();
+
+			//Fill the buffer
+			A7105_WriteReg(A7105_03_FIFOI, 0x1F);
+			A7105_CSN_off;
+			SPI_Write(A7105_RST_WRPTR);
+			SPI_Write(A7105_05_FIFO_DATA);
+			for (uint8_t i = 0; i < WFLYRF_PACKET_SIZE; i++)
+				SPI_Write(packet[i]);
+			A7105_CSN_on;
+			
+			phase++;	// WFLYRF_PLL_TX
+			return WFLYRF_BUFFER_TIME;
+		case WFLYRF_PLL_TX:
+			A7105_Strobe(A7105_PLL);
+			//Check if RX
+			//if((A7105_ReadReg(A7105_00_MODE) & 0x01) && !(A7105_ReadReg(A7105_00_MODE) & (1<<5 | 1<<6)))
+			if(!(A7105_ReadReg(A7105_00_MODE) & (1<<5 | 1<<6)))
+			{ // RX+FECF+CRCF Ok
+				A7105_ReadData(WFLYRF_PACKET_SIZE);
+				//Debug
+				#if 0
+					debug("T:");
+					for(uint8_t i=0; i<WFLYRF_PACKET_SIZE; i++)
+						debug(" %02X", packet[i]);
+					debugln("");
 				#endif
 			}
-	WFLYRF_send_packet();
+			//Change channel
-	return packet_period;
+			A7105_WriteReg(A7105_0F_PLL_I, rf_ch_num);
+			//Send
+			A7105_SetPower();
+			A7105_SetTxRxMode(TX_EN);
+			A7105_Strobe(A7105_TX);
+			phase++;	// WFLYRF_RX
+			return WFLYRF_WRITE_TIME;
+		case WFLYRF_RX:
+			//Wait for TX completion
+			start=micros();
+			while ((uint16_t)((uint16_t)micros()-start) < 700)				// Wait max 700µs
+				if(!(A7105_ReadReg(A7105_00_MODE) & 0x01))
+					break;
+			A7105_WriteReg(A7105_0F_PLL_I, rf_ch_num);
+			A7105_SetTxRxMode(RX_EN);
+			A7105_Strobe(A7105_RX);
+			phase = WFLYRF_DATA;
+			return WFLYRF_PACKET_PERIOD-WFLYRF_WRITE_TIME-WFLYRF_PLL_TX;
+	}
+	return WFLYRF_PACKET_PERIOD; // never reached, please the compiler
 }
 
 uint16_t initWFLYRF()
 {
 	A7105_Init();
 
-	// compute channels from ID
+	#ifdef WFLYRF_FORCE_ID
-	calc_fh_channels(sub_protocol==WFLYRF_FHSS?32:15);
+		//MProtocol_id = 0x50002313;	//Richard
-	hopping_frequency_no=0;
+		MProtocol_id = 0x50000223;	//Pascal
+	#endif
+	MProtocol_id &= 0x0FFFFFFF;		// Since the bind ID starts with 50 this mask might start with 00 instead 0F
+	MProtocol_id |= 0x50000000;		// As recommended on the A7105 datasheet
+	set_rx_tx_addr(MProtocol_id);	// Update the ID
+	
+	hopping_frequency_no=0;
+	rf_ch_num = 0;
 
-	#ifdef WFLYRF_FORCE_ID_FHSS
-		if(sub_protocol==WFLYRF_FHSS)
-		{
-			memcpy(rx_tx_addr,"\x3A\x39\x37\x00",4);
-			memcpy(hopping_frequency,"\x29\x4C\x67\x92\x31\x1C\x77\x18\x23\x6E\x81\x5C\x8F\x5A\x51\x94\x7A\x12\x45\x6C\x7F\x1E\x0D\x88\x63\x8C\x4F\x37\x26\x61\x2C\x8A",32);
-		}
-	#endif
-	if(sub_protocol==WFLYRF_HYPE)
-	{
-		MProtocol_id &= 0x00FF00FF;
-		rx_tx_addr[0] = 0xAF - (rx_tx_addr[1]&0x0F);
-		rx_tx_addr[2] = 0xFF -  rx_tx_addr[3];
-		MProtocol_id |= (rx_tx_addr[0]<<24) + (rx_tx_addr[2]<<8);
-		#ifdef WFLYRF_FORCE_ID_HYPE
-			MProtocol_id=0xAF90738C;
-			set_rx_tx_addr(MProtocol_id);
-			memcpy(hopping_frequency,"\x27\x1B\x63\x75\x03\x39\x57\x69\x87\x0F\x7B\x3F\x33\x51\x6F",15);
-		#endif
 	if(IS_BIND_IN_PROGRESS)
-			A7105_WriteID(0xAF00FF00);
+	{
+		bind_counter = WFLYRF_BIND_COUNT;
+		A7105_WriteID(0x50FFFFFE);	// Bind ID
+		phase = WFLYRF_BIND;
+	}
 	else
 	{
 		A7105_WriteID(MProtocol_id);
-			A7105_WriteReg(A7105_03_FIFOI,0x05);
+		phase = WFLYRF_DATA;
 	}
-	}
-
-	if(IS_BIND_IN_PROGRESS)
-		bind_counter = WFLYRF_BIND_COUNT;
-
-	packet_sent=0;
-	packet_period=3852;		//FHSS
 	return 2000;
 }
 #endif

Multiprotocol/_Config.h

@@ -122,6 +122,7 @@
 //#define FORCE_HUBSAN_TUNING	0
 //#define FORCE_KYOSHO_TUNING	0
 //#define FORCE_PELIKAN_TUNING	0
+//#define FORCE_WFLYRF_TUNING	0
 
 /** CYRF6936 Fine Frequency Tuning **/
 //This is required in rare cases where some CYRF6936 modules and/or RXs have an inaccurate crystal oscillator.