Yuxiang TX2

pascallanger · Jan 15, 2025 · 406f5fe · 406f5fe
1 parent 0e5834a
commit 406f5fe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	4
-#define VERSION_PATCH_LEVEL	14
+#define VERSION_PATCH_LEVEL	15
 
 #define MODE_SERIAL 0
 

diff --git a/Multiprotocol/Yuxiang_nrf24l01.ino b/Multiprotocol/Yuxiang_nrf24l01.ino
@@ -118,9 +118,16 @@ static void __attribute__((unused)) YUXIANG_RF_init()
 static void __attribute__((unused)) YUXIANG_initialize_txid()
 {
 	#ifdef YUXIANG_FORCE_ID
-		//TX1
-		memcpy(rx_tx_addr,(uint8_t *)"\xB3\x13\x36\xDD",4); //rx_tx_addr[4]=0xD9
-		memcpy(hopping_frequency,(uint8_t *)"\x32\x35\x42\x49",4);
+		if(RX_num==0)
+		{//TX1
+			memcpy(rx_tx_addr,(uint8_t *)"\xB3\x13\x36\xDD",4); //rx_tx_addr[4]=0xD9
+			memcpy(hopping_frequency,(uint8_t *)"\x49\x32\x35\x42",4);
+		}
+		else
+		{//TX2
+			memcpy(rx_tx_addr,(uint8_t *)"\xEB\x13\x36\xAC",4); //rx_tx_addr[4]=0xE0
+			memcpy(hopping_frequency,(uint8_t *)"\x4D\x3A\x3E\x47",4);
+		}
 	#endif
 	uint8_t sum=0;
 	for(uint8_t i=0; i<4; i++)