From 7da6d52a846608fdf17eedced8c1f8afc479151b Mon Sep 17 00:00:00 2001
From: pascallanger <pascal_langer@yahoo.fr>
Date: Fri, 1 Dec 2023 10:58:56 +0100
Subject: [PATCH] CYRF data codes are always 16

Removed useless function argument
LOSI now points to the DSM data codes = dependency on DSM
---
 Multiprotocol/CYRF6936_SPI.ino    |  6 +++---
 Multiprotocol/DSM.ino             | 10 +++++-----
 Multiprotocol/DSM_Rx_cyrf6936.ino |  6 +++---
 Multiprotocol/DSM_cyrf6936.ino    |  8 ++++----
 Multiprotocol/J6Pro_cyrf6936.ino  |  2 +-
 Multiprotocol/Losi_cyrf6936.ino   | 17 +++++++++++------
 Multiprotocol/MLINK_cyrf6936.ino  |  4 ++--
 Multiprotocol/Multiprotocol.h     |  2 +-
 Multiprotocol/Validate.h          |  3 +++
 Multiprotocol/_Config.h           |  2 +-
 Multiprotocol/iface_cyrf6936.h    |  2 +-
 Protocols_Details.md              |  2 --
 12 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/Multiprotocol/CYRF6936_SPI.ino b/Multiprotocol/CYRF6936_SPI.ino
index 722c787..abef608 100644
--- a/Multiprotocol/CYRF6936_SPI.ino
+++ b/Multiprotocol/CYRF6936_SPI.ino
@@ -195,11 +195,11 @@ void CYRF_ConfigSOPCode(const uint8_t *sopcodes)
 	CYRF_WriteRegisterMulti(CYRF_22_SOP_CODE, sopcodes, 8);
 }
 
-void CYRF_ConfigDataCode(const uint8_t *datacodes, uint8_t len)
+void CYRF_ConfigDataCode(const uint8_t *datacodes)
 {
 	//NOTE: This can also be implemented as:
-	//for(i = 0; i < len; i++) WriteRegister)0x23, datacodes[i];
-	CYRF_WriteRegisterMulti(CYRF_23_DATA_CODE, datacodes, len);
+	//for(i = 0; i < 16; i++) WriteRegister)0x23, datacodes[i];
+	CYRF_WriteRegisterMulti(CYRF_23_DATA_CODE, datacodes, 16);
 }
 
 void CYRF_WritePreamble(uint32_t preamble)
diff --git a/Multiprotocol/DSM.ino b/Multiprotocol/DSM.ino
index 1902ef1..a6edad7 100644
--- a/Multiprotocol/DSM.ino
+++ b/Multiprotocol/DSM.ino
@@ -65,7 +65,7 @@ const uint8_t PROGMEM DSM_pncodes[5][9][8] = {
 	},
 };
 
-static void __attribute__((unused)) DSM_read_code(uint8_t *buf, uint8_t row, uint8_t col, uint8_t len)
+static void __attribute__((unused)) DSM_read_code(uint8_t *buf, uint8_t row, uint8_t col)
 {
 	for(uint8_t i=0;i<len;i++)
 		buf[i]=pgm_read_byte_near( &DSM_pncodes[row][col][i] );
@@ -137,11 +137,11 @@ static void __attribute__((unused)) DSM_set_sop_data_crc(bool ch2, bool dsmx)
 		debug_time();
 		debug(" crc:%04X,row:%d,col:%d,rf:%02X",(~seed)&0xffff,pn_row,sop_col,hopping_frequency[hopping_frequency_no]);
 	#endif
-	DSM_read_code(code,pn_row,sop_col,8);					// pn_row between 0 and 4, sop_col between 1 and 7
+	DSM_read_code(code,pn_row,sop_col);						// pn_row between 0 and 4, sop_col between 1 and 7
 	CYRF_ConfigSOPCode(code);
-	DSM_read_code(code,pn_row,7 - sop_col,8);				// 7-sop_col between 0 and 6
-	DSM_read_code(code+8,pn_row,7 - sop_col + 1,8);			// 7-sop_col+1 between 1 and 7
-	CYRF_ConfigDataCode(code, 16);
+	DSM_read_code(code,pn_row,7 - sop_col);					// 7-sop_col between 0 and 6
+	DSM_read_code(code+8,pn_row,7 - sop_col + 1);			// 7-sop_col+1 between 1 and 7
+	CYRF_ConfigDataCode(code);
 
 	CYRF_ConfigRFChannel(hopping_frequency[hopping_frequency_no]);
 	hopping_frequency_no++;
diff --git a/Multiprotocol/DSM_Rx_cyrf6936.ino b/Multiprotocol/DSM_Rx_cyrf6936.ino
index 7abc453..992c527 100644
--- a/Multiprotocol/DSM_Rx_cyrf6936.ino
+++ b/Multiprotocol/DSM_Rx_cyrf6936.ino
@@ -39,8 +39,8 @@ static void __attribute__((unused)) DSM_RX_RF_init()
 	{
 		//64 SDR Mode is configured so only the 8 first values are needed but need to write 16 values...
 		uint8_t code[16];
-		DSM_read_code(code,0,8,8);
-		CYRF_ConfigDataCode(code, 16);
+		DSM_read_code(code,0,8);
+		CYRF_ConfigDataCode(code);
 		CYRF_ConfigRFChannel(1);
 		CYRF_SetTxRxMode(RX_EN);									// Force end state read
 		CYRF_WriteRegister(CYRF_05_RX_CTRL, 0x83);					// Prepare to receive
@@ -277,7 +277,7 @@ uint16_t DSM_RX_callback()
 						eeprom_write_byte((EE_ADDR)temp, DSM_rx_type);
 						CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x20);	// Abort RX operation
 						CYRF_SetTxRxMode(TX_EN);					// Force end state TX
-						CYRF_ConfigDataCode((const uint8_t *)"\x98\x88\x1B\xE4\x30\x79\x03\x84", 16);
+						CYRF_ConfigDataCode((const uint8_t *)"\x98\x88\x1B\xE4\x30\x79\x03\x84");
 						CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x00);	// Clear abort RX
 						DSM_RX_build_bind_packet();
 						bind_counter=500;
diff --git a/Multiprotocol/DSM_cyrf6936.ino b/Multiprotocol/DSM_cyrf6936.ino
index eb1e9c1..0ff3fed 100644
--- a/Multiprotocol/DSM_cyrf6936.ino
+++ b/Multiprotocol/DSM_cyrf6936.ino
@@ -118,8 +118,8 @@ static void __attribute__((unused)) DSM_initialize_bind_phase()
 	CYRF_ConfigRFChannel(DSM_BIND_CHANNEL); //This seems to be random?
 	//64 SDR Mode is configured so only the 8 first values are needed but need to write 16 values...
 	uint8_t code[16];
-	DSM_read_code(code,0,8,8);
-	CYRF_ConfigDataCode(code, 16);
+	DSM_read_code(code,0,8);
+	CYRF_ConfigDataCode(code);
 	DSM_build_bind_packet();
 }
 
@@ -292,8 +292,8 @@ uint16_t DSM_callback()
 			return 10000;
 	#if defined DSM_TELEMETRY
 		case DSM_BIND_CHECK:
-			//64 SDR Mode is configured so only the 8 first values are needed but we need to write 16 values...
-			CYRF_ConfigDataCode((const uint8_t *)"\x98\x88\x1B\xE4\x30\x79\x03\x84", 16);
+			//64 SDR Mode is configured so only the 8 first values are needed
+			CYRF_ConfigDataCode((const uint8_t *)"\x98\x88\x1B\xE4\x30\x79\x03\x84");
 			CYRF_SetTxRxMode(RX_EN);							//Receive mode
 			CYRF_WriteRegister(CYRF_05_RX_CTRL, 0x87);			//Prepare to receive
 			bind_counter=2*DSM_BIND_COUNT;						//Timeout of 4.2s if no packet received
diff --git a/Multiprotocol/J6Pro_cyrf6936.ino b/Multiprotocol/J6Pro_cyrf6936.ino
index fd58051..a62827e 100644
--- a/Multiprotocol/J6Pro_cyrf6936.ino
+++ b/Multiprotocol/J6Pro_cyrf6936.ino
@@ -86,7 +86,7 @@ static void __attribute__((unused)) j6pro_cyrf_init()
     CYRF_WriteRegister(CYRF_1E_RX_OVERRIDE, 0x00);
     
 	//Same as default reset but issues if not configured...
-	CYRF_ConfigDataCode(j6pro_data_code, 16);
+	CYRF_ConfigDataCode(j6pro_data_code);
     CYRF_WritePreamble(0x333302);
 
     CYRF_GetMfgData(cyrfmfg_id);
diff --git a/Multiprotocol/Losi_cyrf6936.ino b/Multiprotocol/Losi_cyrf6936.ino
index 2fdb91f..f619a74 100644
--- a/Multiprotocol/Losi_cyrf6936.ino
+++ b/Multiprotocol/Losi_cyrf6936.ino
@@ -19,6 +19,7 @@
 
 //#define LOSI_FORCE_ID
 
+/* Using DSM.ino data codes since they are the same
 const uint8_t LOSI_data_code[][8] = {
 	//(Freq-1)%5=0
 	{ 0x83, 0xF7, 0xA8, 0x2D, 0x7A, 0x44, 0x64, 0xD3 },
@@ -67,7 +68,7 @@ const uint8_t LOSI_data_code[][8] = {
 	{ 0x40, 0xBA, 0x97, 0xD5, 0x86, 0x4F, 0xCC, 0xD1 },
 	//Bind
 	{ 0xD7, 0xA1, 0x54, 0xB1, 0x5E, 0x89, 0xAE, 0x86 }
-};
+};*/
 
 static uint16_t __attribute__((unused)) LOSI_check(uint16_t val)
 {
@@ -137,7 +138,9 @@ static void __attribute__((unused)) LOSI_cyrf_init()
 	CYRF_WriteRegister(CYRF_1F_TX_OVERRIDE, 0x04);			// No CRC
 	//CYRF_WriteRegister(CYRF_1E_RX_OVERRIDE, 0x14);
 	//CYRF_WriteRegister(CYRF_14_EOP_CTRL, 0x02);
-	CYRF_ConfigDataCode(LOSI_data_code[40], 16);			// Load bind data code by default
+	uint8_t code[16];
+	DSM_read_code(code,0,8);								// Load bind data code by default
+	CYRF_ConfigDataCode(code);
 }
 
 uint16_t LOSI_callback()
@@ -152,7 +155,9 @@ uint16_t LOSI_callback()
 		{
 			BIND_DONE;
 			// Load normal data code
-			CYRF_ConfigDataCode(LOSI_data_code[(((hopping_frequency[0] - 1) % 5) << 3) + ((rx_tx_addr[0] + rx_tx_addr[1] + rx_tx_addr[2]) % 8)], 16);
+			uint8_t code[16];
+			DSM_read_code(code,hopping_frequency[0] % 5,(rx_tx_addr[0] + rx_tx_addr[1] + rx_tx_addr[2]) % 8);
+			CYRF_ConfigDataCode(code);
 			packet_period = 19738;
 		}
 	}
@@ -178,7 +183,7 @@ void LOSI_init()
 		rx_tx_addr[3] = 0xAA;
 		crc8 = 0x0B;
 		num_ch = 0x07;
-		//Data codes hopping_frequency[0] % 5
+		//Data codes for hopping_frequency[0] % 5
 		//{ 0x40, 0xBA, 0x97, 0xD5, 0x86, 0x4F, 0xCC, 0xD1, 0xD7, 0xA1, 0x54, 0xB1, 0x5E, 0x89, 0xAE, 0x86 },
 		//{ 0x62, 0xF5, 0x2B, 0xAA, 0xFC, 0x33, 0xBF, 0xAF, 0x40, 0x56, 0x32, 0xD9, 0x0F, 0xD9, 0x5D, 0x97 },
 		//{ 0x9E, 0x08, 0xD1, 0xAE, 0x59, 0x5E, 0xE8, 0xF0, 0xC0, 0x90, 0x8F, 0xBB, 0x7C, 0x8E, 0x2B, 0x8E },
@@ -191,7 +196,7 @@ void LOSI_init()
 		rx_tx_addr[3] = 0x8A;
 		crc8 = 0x0F;
 		num_ch = 0x02;
-		//Data codes hopping_frequency[0] % 5
+		//Data codes for hopping_frequency[0] % 5
 		//{ 0xF1, 0x94, 0x30, 0x21, 0xA1, 0x1C, 0x88, 0xA9, 0xD0, 0xD2, 0x8E, 0xBC, 0x82, 0x2F, 0xE3, 0xB4 },
 		//{ 0x17, 0xFF, 0x9E, 0x21, 0x36, 0x90, 0xC7, 0x82, 0xBC, 0x5D, 0x9A, 0x5B, 0xEE, 0x7F, 0x42, 0xEB },
 		//{ 0x4C, 0x97, 0x9D, 0xBF, 0xB8, 0x3D, 0xB5, 0xBE, 0x0C, 0x5D, 0x24, 0x30, 0x9F, 0xCA, 0x6D, 0xBD },
@@ -199,7 +204,7 @@ void LOSI_init()
 		//{ 0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA, 0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC }
 		
 		// Note: crc8=00..0F and num_ch=00..07
-		// num_ch = ((rx_tx_addr[0] + rx_tx_addr[1] + rx_tx_addr[2]) % 8);
+		// num_ch = (rx_tx_addr[0] + rx_tx_addr[1] + rx_tx_addr[2]) % 8;
 		// crc8 = (uint16_t)LOSI_check(((rx_tx_addr[2]&0x0F) << 8) + rx_tx_addr[3]) >> 12;
 	#endif
 
diff --git a/Multiprotocol/MLINK_cyrf6936.ino b/Multiprotocol/MLINK_cyrf6936.ino
index cf833e2..3f0d0ef 100644
--- a/Multiprotocol/MLINK_cyrf6936.ino
+++ b/Multiprotocol/MLINK_cyrf6936.ino
@@ -421,7 +421,7 @@ uint16_t MLINK_callback()
 
 
 		case MLINK_PREP_DATA:
-			CYRF_ConfigDataCode(MLINK_Data_Code,16);
+			CYRF_ConfigDataCode(MLINK_Data_Code);
 			MLINK_CRC_Init += 0xED;
 			hopping_frequency_no = 0x00;
 			CYRF_ConfigRFChannel(hopping_frequency[hopping_frequency_no]);
@@ -597,7 +597,7 @@ void MLINK_init()
 	{
 		packet_count = 0;
 		bind_counter = MLINK_BIND_COUNT;
-		CYRF_ConfigDataCode((uint8_t*)"\x6F\xBE\x32\x01\xDB\xF1\x2B\x01\xE3\x5C\xFA\x02\x97\x93\xF9\x02",16); //Bind data code
+		CYRF_ConfigDataCode((uint8_t*)"\x6F\xBE\x32\x01\xDB\xF1\x2B\x01\xE3\x5C\xFA\x02\x97\x93\xF9\x02"); //Bind data code
 		CYRF_ConfigRFChannel(MLINK_BIND_CHANNEL);
 		phase = MLINK_BIND_TX;
 	}
diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index 39ccf9f..4d0dcbf 100644
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	3
-#define VERSION_PATCH_LEVEL	40
+#define VERSION_PATCH_LEVEL	41
 
 #define MODE_SERIAL 0
 
diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h
index 8cc99e2..4c34331 100644
--- a/Multiprotocol/Validate.h
+++ b/Multiprotocol/Validate.h
@@ -352,6 +352,9 @@
 	#undef	V911S_CCNRF_INO
 	#undef	XK_CCNRF_INO
 #endif
+#if not defined(DSM_CYRF6936_INO)
+	#undef	LOSI_CYRF6936_INO
+#endif
 #if not defined(STM32_BOARD)
 	//RF2500 emulation does not work on atmega...
 	#undef	E010R5_CYRF6936_INO
diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h
index bbf619f..e70c12d 100644
--- a/Multiprotocol/_Config.h
+++ b/Multiprotocol/_Config.h
@@ -191,7 +191,7 @@
 //#define	E01X_CYRF6936_INO
 #define	E129_CYRF6936_INO
 #define	J6PRO_CYRF6936_INO
-//#define	LOSI_CYRF6936_INO
+#define	LOSI_CYRF6936_INO		//Need DSM to be enabled
 #define	MLINK_CYRF6936_INO
 #define	SCORPIO_CYRF6936_INO
 #define	TRAXXAS_CYRF6936_INO
diff --git a/Multiprotocol/iface_cyrf6936.h b/Multiprotocol/iface_cyrf6936.h
index cf96f2c..433548a 100644
--- a/Multiprotocol/iface_cyrf6936.h
+++ b/Multiprotocol/iface_cyrf6936.h
@@ -85,7 +85,7 @@ void CYRF_SetPower(u8 power);
 void CYRF_ConfigCRCSeed(u16 crc);
 static void CYRF_StartReceive();
 void CYRF_ConfigSOPCode(const u8 *sopcodes);
-void CYRF_ConfigDataCode(const u8 *datacodes, u8 len);
+void CYRF_ConfigDataCode(const u8 *datacodes);
 static u8 CYRF_ReadRSSI(u32 dodummyread);
 static void CYRF_ReadDataPacket(u8 dpbuffer[]); 
 void CYRF_WriteDataPacket(const u8 dpbuffer[]);
diff --git a/Protocols_Details.md b/Protocols_Details.md
index a8f5559..a5f92e0 100644
--- a/Protocols_Details.md
+++ b/Protocols_Details.md
@@ -640,8 +640,6 @@ A|E|T|R|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12
 ## Losi - *89*
 TX: LSR-3000
 
-**Only 1 ID available**. More IDs can be added if you dump your original TX.
-
 Extended limits supported
 
 CH1|CH2|CH3