Update UDIRC_ccnrf.ino

Lua_scripts/MultiChan.txt

@@ -231,3 +231,4 @@
 102,0,JIABAILE,Std,0,Speed,Light,Flash
 102,1,JIABAILE,Gyro,0,Speed,Light,Flash,Tr_ST
 103,0,H36,Std,1,Flip,HLess,RTH
+104,0,KAMTOM_NRF24L01_INO,Std,1,

Multiprotocol/Multi_Protos.ino

@@ -113,7 +113,7 @@ const char STR_SGF22[]      ="SGF22";
 const char STR_EAZYRC[]     ="EazyRC";
 const char STR_KYOSHO3[]    ="Kyosho3";
 const char STR_YUXIANG[]    ="YuXiang";
-const char STR_PINECONE[]   ="PineCone";
+const char STR_UDIRC[]      ="UDIRC";
 const char STR_JIABAILE[]	="JIABAILE";
 
 const char STR_SUBTYPE_FLYSKY[] =     "\x04""Std\0""V9x9""V6x6""V912""CX20";
@@ -436,9 +436,6 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(PELIKAN_A7105_INO)
 		{PROTO_PELIKAN,    STR_PELIKAN,   STR_SUBTYPE_PELIKAN,   3, OPTION_NONE,    0, 1, SW_A7105,  PELIKAN_init,    PELIKAN_callback    },
 	#endif
-	#if defined(PINECONE_CCNRF_INO)
-		{PROTO_PINECONE,   STR_PINECONE,  NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    PINECONE_init,   PINECONE_callback   },
-	#endif
 	#if defined(POTENSIC_NRF24L01_INO)
 		{PROTO_POTENSIC,   STR_POTENSIC,  STR_SUBTYPE_POTENSIC,  1, OPTION_NONE,    0, 0, SW_NRF,    POTENSIC_init,   POTENSIC_callback   },
 	#endif
@@ -487,6 +484,9 @@ const mm_protocol_definition multi_protocols[] = {
 	#if defined(TRAXXAS_CYRF6936_INO)
 		{PROTO_TRAXXAS,    STR_TRAXXAS,   STR_SUBTYPE_TRAXXAS,   2, OPTION_NONE,    0, 0, SW_CYRF,   TRAXXAS_init,    TRAXXAS_callback    },
 	#endif
+	#if defined(UDIRC_CCNRF_INO)
+		{PROTO_UDIRC,      STR_UDIRC,     NO_SUBTYPE,            0, OPTION_NONE,    0, 0, SW_NRF,    UDIRC_init,      UDIRC_callback      },
+	#endif
 	#if defined(V2X2_NRF24L01_INO)
 		{PROTO_V2X2,       STR_V2X2,      STR_SUBTYPE_V2X2,      3, OPTION_NONE,    0, 0, SW_NRF,    V2X2_init,       V2X2_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	31
+#define VERSION_PATCH_LEVEL	33
 
 #define MODE_SERIAL 0
 
@@ -128,7 +128,7 @@ enum PROTOCOLS
 	PROTO_KYOSHO3	= 98,	// =>CYRF6936
 	PROTO_XK2		= 99,	// =>CC2500 & NRF24L01
 	PROTO_YUXIANG	= 100,	// =>NRF24L01
-	PROTO_PINECONE	= 101,	// =>CC2500 & NRF24L01
+	PROTO_UDIRC		= 101,	// =>CC2500 & NRF24L01
 	PROTO_JIABAILE	= 102,	// =>NRF24L01
 	PROTO_H36		= 103,	// =>NRF24L01
 	

Multiprotocol/Pinecone_ccnrf.ino

@@ -1,167 +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(PINECONE_CCNRF_INO)
-
-#include "iface_xn297.h"
-
-#define FORCE_PINECONE_ORIGINAL_ID
-
-#define PINECONE_PAYLOAD_SIZE			15
-#define PINECONE_RF_NUM_CHANNELS		4
-#define PINECONE_PACKET_PERIOD			9000
-#define PINECONE_BIND_COUNT				2000
-#define PINECONE_WRITE_TIME				1500
-
-enum {
-	PINECONE_DATA=0,
-	PINECONE_RX,
-};
-
-static void __attribute__((unused)) PINECONE_send_packet()
-{
-	if(rf_ch_num==0)
-	{
-		XN297_Hopping(hopping_frequency_no);
-		debug("H %d ",hopping_frequency_no);
-		hopping_frequency_no++;
-		hopping_frequency_no &= 3;
-	}
-
-	if(bind_counter==0) bind_counter=2;
-	memset(&packet[3], 0x00, 12);
-	if(bind_counter)
-	{//Bind in progress
-		bind_counter--;
-		if(bind_counter)
-		{//Bind
-			packet[0] = 0x01;
-			memcpy(&packet[1],rx_tx_addr,5);
-		}
-		else
-		{//Switch to normal
-			XN297_SetTXAddr(rx_tx_addr, 5);
-			XN297_SetRXAddr(rx_tx_addr, PINECONE_PAYLOAD_SIZE);
-		}
-	}
-	if(!bind_counter)
-	{//Normal
-		packet[0] = 0x08;
-		packet[1] = convert_channel_16b_limit(AILERON,0,200);	//ST
-		packet[2] = convert_channel_16b_limit(THROTTLE,0,200);	//TH
-		packet[3] = convert_channel_16b_limit(ELEVATOR,0,200);	//CH4
-		packet[4] = convert_channel_16b_limit(RUDDER,0,200);	//CH3
-	}
-	//packet[5/6..8] = 00 unknown
-	packet[9] = convert_channel_16b_limit(CH5,0,200);			//ESP
-	packet[10] = convert_channel_16b_limit(CH6,0,200);			//ST_TRIM
-	packet[11] = convert_channel_16b_limit(CH7,0,200);			//ST_DR
-	packet[12] = GET_FLAG(CH8_SW,  0x40)						//TH.REV
-				|GET_FLAG(CH9_SW,  0x80);						//ST.REV
-	//packet[13] = 00 unknown
-	for(uint8_t i=0;i<PINECONE_PAYLOAD_SIZE-1;i++)
-		packet[14] += packet[i];
-	// Send
-	XN297_SetPower();
-	XN297_SetTxRxMode(TX_EN);
-	XN297_WriteEnhancedPayload(packet, PINECONE_PAYLOAD_SIZE,false);
-	#ifdef DEBUG_SERIAL
-		for(uint8_t i=0; i < PINECONE_PAYLOAD_SIZE; i++)
-			debug("%02X ", packet[i]);
-		debugln();
-	#endif
-}
-
-static void __attribute__((unused)) PINECONE_initialize_txid()
-{
-	#ifdef FORCE_PINECONE_ORIGINAL_ID
-		rx_tx_addr[0] = 0xD0;
-		rx_tx_addr[1] = 0x06;
-		rx_tx_addr[2] = 0x00;
-		rx_tx_addr[3] = 0x00;
-		rx_tx_addr[4] = 0x81;
-		hopping_frequency[0] = 45;
-		hopping_frequency[1] = 59;
-		hopping_frequency[2] = 52;
-		hopping_frequency[3] = 67;
-	#endif
-}
-
-static void __attribute__((unused)) PINECONE_RF_init()
-{
-	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_250K);
-	//Bind address
-	XN297_SetTXAddr((uint8_t*)"\x01\x03\x05\x07\x09", 5);
-	XN297_SetRXAddr((uint8_t*)"\x01\x03\x05\x07\x09", PINECONE_PAYLOAD_SIZE);
-	XN297_HoppingCalib(PINECONE_RF_NUM_CHANNELS);
-}
-
-uint16_t PINECONE_callback()
-{
-	bool rx;
-	switch(phase)
-	{
-		case PINECONE_DATA:
-			rx = XN297_IsRX();
-			XN297_SetTxRxMode(TXRX_OFF);
-			#ifdef MULTI_SYNC
-				telemetry_set_input_sync(PINECONE_PACKET_PERIOD);
-			#endif
-			PINECONE_send_packet();
-			if(rx)
-			{
-				uint8_t val=XN297_ReadEnhancedPayload(packet_in, PINECONE_PAYLOAD_SIZE);
-				debug("RX %d ",val);
-				if(val==0)
-					rf_ch_num = 1;
-				else
-				{
-					#ifdef DEBUG_SERIAL
-						for(uint8_t i=0; i < PINECONE_PAYLOAD_SIZE; i++)
-							debug("%02X ", packet_in[i]);
-						debugln();
-					#endif
-					//could check the validity of the packet by looking at the sum...
-				}
-				//else
-				//	debug("NOK");
-				debugln("");
-			}
-			phase++;
-			return PINECONE_WRITE_TIME;
-		default: //PINECONE_RX
-			//Wait for the packet transmission to finish
-			while(XN297_IsPacketSent()==false);
-			//Switch to RX
-			XN297_SetTxRxMode(TXRX_OFF);
-			XN297_SetTxRxMode(RX_EN);
-			phase = PINECONE_DATA;
-			return PINECONE_PACKET_PERIOD - PINECONE_WRITE_TIME;
-	}
-	return 0;
-}
-
-void PINECONE_init()
-{
-	PINECONE_initialize_txid();
-	PINECONE_RF_init();
-
-	bind_counter = IS_BIND_IN_PROGRESS ? PINECONE_BIND_COUNT : 1;
-	phase = PINECONE_DATA;
-	hopping_frequency_no = 0;
-	rf_ch_num=0;
-	bind_counter = 2000;
-}
-
-#endif

Multiprotocol/SGF22_nrf24l01.ino

@@ -169,7 +169,7 @@ uint16_t SGF22_callback()
 	}
 	else
 	{//send 3 times in total the same packet
-		NRF24L01_Strobe(REUSE_TX_PL);
+		XN297_ReSendPayload();
 		phase++;
 		if(phase > 2)
 		{

Multiprotocol/UDIRC_ccnrf.ino

@@ -0,0 +1,184 @@
+/*
+ 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/>.
+ */
+//Models: UDIRC UD160x(PRO), Pinecone Models SG-160x, Eachine EAT15
+
+#if defined(UDIRC_CCNRF_INO)
+
+#include "iface_xn297.h"
+
+#define FORCE_UDIRC_ORIGINAL_ID
+
+#define UDIRC_PAYLOAD_SIZE			15
+#define UDIRC_RF_NUM_CHANNELS		4
+#define UDIRC_PACKET_PERIOD			21000
+#define UDIRC_BIND_COUNT			2000
+#define UDIRC_P1_P2_TIME			5000
+#define UDIRC_WRITE_TIME			1500
+
+enum {
+	UDIRC_DATA1=0,
+	UDIRC_DATA2,
+	UDIRC_DATA3,
+	UDIRC_RX,
+};
+
+static void __attribute__((unused)) UDIRC_send_packet()
+{
+	if(rf_ch_num==0)
+	{
+		XN297_Hopping(hopping_frequency_no);
+		debug("H %d ",hopping_frequency_no);
+		hopping_frequency_no++;
+		hopping_frequency_no &= 3;
+	}
+
+	memset(&packet[3], 0x00, 12);
+	if(bind_counter)
+	{//Bind in progress
+		bind_counter--;
+		if(bind_counter)
+		{//Bind
+			packet[0] = 0x01;
+			memcpy(&packet[1],rx_tx_addr,5);
+		}
+		else
+		{//Switch to normal
+			rf_ch_num = 1;
+			BIND_DONE;
+			XN297_SetTXAddr(rx_tx_addr, 5);
+			XN297_SetRXAddr(rx_tx_addr, UDIRC_PAYLOAD_SIZE);
+		}
+	}
+	if(!bind_counter)
+	{//Normal
+		packet[0] = 0x08;
+		//Channels SG-16xx: ST/TH/CH4 /CH3  /UNK/UNK/UNK/UNK/GYRO/ST_TRIM/ST_DR
+		//Channels EAT15  : ST/TH/RATE/LIGHT/UNK/UNK/UNK/UNK/GYRO/ST_TRIM/ST_DR
+		for(uint8_t i=0; i<12; i++)
+			packet[i+1] = convert_channel_16b_limit(i,0,200);
+		//Just for now let's set the additional channels to 0
+		packet[5] = packet[6] = packet[7] = packet[8] = 0;
+	}
+	packet[12] = GET_FLAG(CH12_SW,  0x40)						//TH.REV
+				|GET_FLAG(CH13_SW,  0x80);						//ST.REV
+	//packet[13] = 00; //Unknown, future flags?
+	for(uint8_t i=0;i<UDIRC_PAYLOAD_SIZE-1;i++)
+		packet[14] += packet[i];
+	// Send
+	XN297_SetFreqOffset();
+	XN297_SetPower();
+	XN297_SetTxRxMode(TX_EN);
+	XN297_WriteEnhancedPayload(packet, UDIRC_PAYLOAD_SIZE,false);
+	#ifdef DEBUG_SERIAL
+		for(uint8_t i=0; i < UDIRC_PAYLOAD_SIZE; i++)
+			debug("%02X ", packet[i]);
+		debugln();
+	#endif
+}
+
+static void __attribute__((unused)) UDIRC_initialize_txid()
+{
+	#ifdef FORCE_UDIRC_ORIGINAL_ID
+		if(RX_num)
+		{
+			rx_tx_addr[0] = 0xD0;
+			rx_tx_addr[1] = 0x06;
+			rx_tx_addr[2] = 0x00;
+			rx_tx_addr[3] = 0x00;
+			rx_tx_addr[4] = 0x81;
+		}
+		else
+		{
+			rx_tx_addr[0] = 0xF6;
+			rx_tx_addr[1] = 0x96;
+			rx_tx_addr[2] = 0x01;
+			rx_tx_addr[3] = 0x00;
+			rx_tx_addr[4] = 0x81;
+		}
+		hopping_frequency[0] = 45;
+		hopping_frequency[1] = 59;
+		hopping_frequency[2] = 52;
+		hopping_frequency[3] = 67;
+	#endif
+}
+
+static void __attribute__((unused)) UDIRC_RF_init()
+{
+	XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_250K);
+	//Bind address
+	XN297_SetTXAddr((uint8_t*)"\x01\x03\x05\x07\x09", 5);
+	XN297_SetRXAddr((uint8_t*)"\x01\x03\x05\x07\x09", UDIRC_PAYLOAD_SIZE);
+	XN297_HoppingCalib(UDIRC_RF_NUM_CHANNELS);
+}
+
+uint16_t UDIRC_callback()
+{
+	bool rx;
+	switch(phase)
+	{
+		case UDIRC_DATA1:
+			rx = XN297_IsRX();
+			XN297_SetTxRxMode(TXRX_OFF);
+			#ifdef MULTI_SYNC
+				telemetry_set_input_sync(UDIRC_PACKET_PERIOD);
+			#endif
+			UDIRC_send_packet();
+			if(rx)
+			{
+				uint8_t val=XN297_ReadEnhancedPayload(packet_in, UDIRC_PAYLOAD_SIZE);
+				debug("RX(%d):",val);
+				if(val != 255)
+				{
+					rf_ch_num = 1;
+					if(bind_counter)
+						bind_counter=1;
+					#ifdef DEBUG_SERIAL
+						for(uint8_t i=0; i < UDIRC_PAYLOAD_SIZE; i++)
+							debug(" %02X", packet_in[i]);
+					#endif
+				}
+				debugln("");
+			}
+			phase++;
+			return UDIRC_P1_P2_TIME;
+		case UDIRC_DATA2:
+			//Resend packet
+			XN297_ReSendPayload();
+			phase++;
+			return UDIRC_WRITE_TIME;
+		default: //UDIRC_RX
+			//Wait for the packet transmission to finish
+			while(XN297_IsPacketSent()==false);
+			//Switch to RX
+			XN297_SetTxRxMode(TXRX_OFF);
+			XN297_SetTxRxMode(RX_EN);
+			phase = UDIRC_DATA1;
+			return UDIRC_PACKET_PERIOD - UDIRC_P1_P2_TIME - UDIRC_WRITE_TIME;
+	}
+	return 0;
+}
+
+void UDIRC_init()
+{
+	UDIRC_initialize_txid();
+	UDIRC_RF_init();
+
+	bind_counter = IS_BIND_IN_PROGRESS ? UDIRC_BIND_COUNT : 1;
+	phase = UDIRC_DATA1;
+	hopping_frequency_no = 0;
+	rf_ch_num = 0;
+}
+
+#endif

Multiprotocol/Validate.h

@@ -355,6 +355,7 @@
 	#undef	Q303_CCNRF_INO
 	#undef	Q90C_CCNRF_INO
 	#undef	SLT_CCNRF_INO
+	#undef	UDIRC_CCNRF_INO
 	#undef	V911S_CCNRF_INO
 	#undef	XK_CCNRF_INO
 	#undef	XK2_CCNRF_INO
@@ -391,6 +392,7 @@
 	#undef	MOULDKG_NRF24L01_INO
 	#undef	SHENQI_NRF24L01_INO
 	#undef	JIABAILE_NRF24L01_INO
+	#undef	UDIRC_CCNRF_INO
 #endif
 
 #ifdef MULTI_SURFACE

Multiprotocol/XN297_EMU.ino

@@ -207,6 +207,27 @@ static void __attribute__((unused)) XN297_SetTxRxMode(enum TXRX_State mode)
 	#endif
 }
 
+#ifdef CC2500_INSTALLED
+uint8_t XN297_Buffer[32];
+uint8_t XN297_Buffer_Len = 0;
+
+static void __attribute__((unused)) XN297_SendCC2500Payload()
+{
+	// stop TX/RX
+	CC2500_Strobe(CC2500_SIDLE);
+	// flush tx FIFO
+	CC2500_Strobe(CC2500_SFTX);
+	// packet length
+	CC2500_WriteReg(CC2500_06_PKTLEN, XN297_Buffer_Len + 4);  // Packet len, fix packet len
+	// xn297L preamble
+	CC2500_WriteRegisterMulti(CC2500_3F_TXFIFO, (uint8_t*)"\x0C\x71\x0F\x55", 4);
+	// xn297 packet
+	CC2500_WriteRegisterMulti(CC2500_3F_TXFIFO, XN297_Buffer, XN297_Buffer_Len);
+	// transmit
+	CC2500_Strobe(CC2500_STX);
+}
+#endif
+
 static void __attribute__((unused)) XN297_SendPayload(uint8_t* msg, uint8_t len)
 {
 	#ifdef NRF24L01_INSTALLED
@@ -220,22 +241,25 @@ static void __attribute__((unused)) XN297_SendPayload(uint8_t* msg, uint8_t len)
 	#ifdef CC2500_INSTALLED
 		if(xn297_rf == XN297_CC2500)
 		{
-			// stop TX/RX
-			CC2500_Strobe(CC2500_SIDLE);
-			// flush tx FIFO
-			CC2500_Strobe(CC2500_SFTX);
-			// packet length
-			CC2500_WriteReg(CC2500_06_PKTLEN, len + 4);  // Packet len, fix packet len
-			// xn297L preamble
-			CC2500_WriteRegisterMulti(CC2500_3F_TXFIFO, (uint8_t*)"\x0C\x71\x0F\x55", 4);
-			// xn297 packet
-			CC2500_WriteRegisterMulti(CC2500_3F_TXFIFO, msg, len);
-			// transmit
-			CC2500_Strobe(CC2500_STX);
+			memcpy(XN297_Buffer, msg, len);
+			XN297_Buffer_Len = len;
+			XN297_SendCC2500Payload();
 		}
 	#endif
 }
 
+static void __attribute__((unused)) XN297_ReSendPayload()
+{
+	#ifdef NRF24L01_INSTALLED
+		if(xn297_rf == XN297_NRF)
+			NRF24L01_Strobe(NRF24L01_E3_REUSE_TX_PL);
+	#endif
+	#ifdef CC2500_INSTALLED
+		if(xn297_rf == XN297_CC2500)
+			XN297_SendCC2500Payload();
+	#endif
+}
+
 static void __attribute__((unused)) XN297_WritePayload(uint8_t* msg, uint8_t len)
 {
 	uint8_t buf[32];

Multiprotocol/_Config.h

@@ -273,6 +273,7 @@
 #define	Q303_CCNRF_INO
 #define	Q90C_CCNRF_INO
 #define	SLT_CCNRF_INO
+#define	UDIRC_CCNRF_INO
 #define	V911S_CCNRF_INO
 #define	XK_CCNRF_INO
 #define	XK2_CCNRF_INO
@@ -845,6 +846,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		SYMAX5C
 	PROTO_TRAXXAS
 		NONE
+	PROTO_UDIRC
+		NONE
 	PROTO_V2X2
 		V2X2
 		JXD506

Multiprotocol/iface_xn297.h

@@ -28,6 +28,7 @@ static void __attribute__((unused)) XN297_SetTXAddr(const uint8_t*, uint8_t);
 static void __attribute__((unused)) XN297_SetRXAddr(const uint8_t*, uint8_t);
 static void __attribute__((unused)) XN297_SetTxRxMode(enum TXRX_State);
 static void __attribute__((unused)) XN297_SendPayload(uint8_t*, uint8_t);
+static void __attribute__((unused)) XN297_ReSendPayload();
 static void __attribute__((unused)) XN297_WritePayload(uint8_t*, uint8_t);
 static void __attribute__((unused)) XN297_WriteEnhancedPayload(uint8_t*, uint8_t, uint8_t);
 static bool __attribute__((unused)) XN297_IsRX();