From d9f8a3989a638816e409ad4a0a48035624b9e24c Mon Sep 17 00:00:00 2001
From: pascallanger <pascal_langer@yahoo.fr>
Date: Fri, 15 Jul 2022 15:43:04 +0200
Subject: [PATCH] FX/FX620: only 1 ID

---
 Multiprotocol/FX_nrf24l01.ino | 13 ++++++-------
 Multiprotocol/Multiprotocol.h |  2 +-
 Protocols_Details.md          | 18 +++++++++++++-----
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Multiprotocol/FX_nrf24l01.ino b/Multiprotocol/FX_nrf24l01.ino
index dd21443..8c36891 100644
--- a/Multiprotocol/FX_nrf24l01.ino
+++ b/Multiprotocol/FX_nrf24l01.ino
@@ -18,7 +18,6 @@ Multiprotocol is distributed in the hope that it will be useful,
 
 #include "iface_xn297.h"
 
-#define FX_INITIAL_WAIT				500
 #define FX_BIND_COUNT				300		//3sec
 #define FX_SWITCH					20
 #define FX_NUM_CHANNELS				4
@@ -74,6 +73,8 @@ static void __attribute__((unused)) FX_send_packet()
 		{
 			memcpy(packet,rx_tx_addr,3);
 			packet[3] = hopping_frequency[0];
+			if(bind_counter > (FX_BIND_COUNT >> 1))
+				packet[5] = 0x78;
 		}
 		else
 		{
@@ -108,11 +109,15 @@ static void __attribute__((unused)) FX_RF_init()
 	{
 		XN297_SetTXAddr((uint8_t *)"\xcc\xcc\xcc\xcc\xcc", 5);
 		XN297_RFChannel(FX816_BIND_CHANNEL);
+		packet_period = FX816_PACKET_PERIOD;
+		packet_length = FX816_PAYLOAD_SIZE;
 	}
 	else //FX620
 	{
 		XN297_SetTXAddr((uint8_t *)"\xaa\xbb\xcc", 3);
 		XN297_RFChannel(FX620_BIND_CHANNEL);
+		packet_period = FX620_BIND_PACKET_PERIOD;
+		packet_length = FX620_PAYLOAD_SIZE;
 	}
 }
 
@@ -127,9 +132,6 @@ static void __attribute__((unused)) FX_initialize_txid()
 		memcpy(hopping_frequency,"\x09\x1B\x30\x42",FX_NUM_CHANNELS);		//Original dump=9=0x09,27=0x1B,48=0x30,66=0x42
 		for(uint8_t i=0;i<FX_NUM_CHANNELS;i++)
 			hopping_frequency[i]+=rx_tx_addr[3]&0x07;
-
-		packet_length = FX816_PAYLOAD_SIZE;
-		packet_period = FX816_PACKET_PERIOD;
 	}
 	else//FX620
 	{
@@ -141,9 +143,6 @@ static void __attribute__((unused)) FX_initialize_txid()
 		#endif
 		for(uint8_t i=1;i<FX_NUM_CHANNELS;i++)
 			hopping_frequency[i] = i*10 + hopping_frequency[0];
-
-		packet_length = FX620_PAYLOAD_SIZE;
-		packet_period = FX620_BIND_PACKET_PERIOD;
 	}
 }
 
diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index 8f17876..bf0df26 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	17
+#define VERSION_PATCH_LEVEL	18
 
 #define MODE_SERIAL 0
 
diff --git a/Protocols_Details.md b/Protocols_Details.md
index e945fd9..dd87b2d 100644
--- a/Protocols_Details.md
+++ b/Protocols_Details.md
@@ -96,7 +96,7 @@ CFlie|38|CFlie||||||||NRF24L01|
 [FrskyX2](Protocols_Details.md#FRSKYX2---64)|64|CH_16|CH_8|EU_16|EU_8|Cloned|Cloned_8|||CC2500|
 [Frsky_RX](Protocols_Details.md#FRSKY_RX---55)|55|Multi|CloneTX|EraseTX|CPPM|||||CC2500|
 [Futaba/SFHSS](Protocols_Details.md#Futaba---21)|21|SFHSS||||||||CC2500|
-[FX816](Protocols_Details.md#FX816---58)|28|FX816||||||||NRF24L01|
+[FX](Protocols_Details.md#FX---58)|28|816|620|||||||NRF24L01|
 [FY326](Protocols_Details.md#FY326---20)|20|FY326|FY319|||||||NRF24L01|
 [GD00X](Protocols_Details.md#GD00X---47)|47|GD_V1*|GD_V2*|||||||NRF24L01|XN297L
 [GW008](Protocols_Details.md#GW008---32)|32|||||||||NRF24L01|XN297
@@ -1600,15 +1600,23 @@ A|E|T|R|FMODE|AUX6|AUX7
 
 FMODE and AUX7 have 4 positions: -100%..-50%=>0, -50%..5%=>1, 5%..50%=>2, 50%..100%=>3
 
-## FX816 - *58*
-Model: FEI XIONG FX P38, B17
-
-Only 8 TX IDs available
+## FX - *58*
+FEI XIONG
 
 CH1|CH2|CH3|CH4
 ---|---|---|---
 A|-|T|-
 
+### Sub_protocol 816 - *0*
+Model: FX816 P38, B17
+
+Only 8 TX IDs available
+
+### Sub_protocol 620 - *1*
+Model: FX620 SU35
+
+Only 1 TX ID available
+
 ## FY326 - *20*
 
 ### Sub_protocol FY326 - *0*