Enable custom address and radio channel

Author: matejkarasek

Multiprotocol/CFlie_nrf24l01.ino

@@ -789,25 +789,31 @@ static uint8_t CFLIE_initialize_rx_tx_addr()
     rx_tx_addr[0] = 
     rx_tx_addr[1] = 
     rx_tx_addr[2] = 
-    rx_tx_addr[3] = 
-    rx_tx_addr[4] = 0xE7; // CFlie uses fixed address
-
+    rx_tx_addr[3] = 0xE7;
+	
+	unsigned x10 = (RX_num / 10U) % 10;
+	unsigned x1 = RX_num - x10*10;
+    
     switch (sub_protocol) {
     case CFLIE_2Mbps:
       data_rate = NRF24L01_BR_2M;
-      rf_ch_num = option;
+      rf_ch_num = option; // "RF channel" in the transmitter <0, 125>
+	  rx_tx_addr[4] = x10*16 + x1; // "Receiver" in the transmitter <0, 63>
       break;
     case CFLIE_1Mbps:
       data_rate = NRF24L01_BR_1M;
-      rf_ch_num = option;
+      rf_ch_num = option; // "RF channel" in the transmitter <0, 125>
+	  rx_tx_addr[4] = x10*16 + x1; // "Receiver" in the transmitter <0, 63>
       break;  
     case CFLIE_250kbps:
       data_rate = NRF24L01_BR_250K;
-      rf_ch_num = option;
+      rf_ch_num = option; // "RF channel" in the transmitter <0, 125>
+	  rx_tx_addr[4] = x10*16 + x1; // "Receiver" in the transmitter <0, 63>
       break;
     default:  
       data_rate = NRF24L01_BR_2M;
       rf_ch_num = 80;
+	  rx_tx_addr[4] = 0xE7; // CFlie uses fixed address
     }
 
     return CFLIE_INIT_SEARCH;

Multiprotocol/_Config.h

@@ -230,9 +230,9 @@
 #define	ESKY150_NRF24L01_INO
 #define	FQ777_NRF24L01_INO
 #define	FX_NRF24L01_INO
-#define	FY326_NRF24L01_INO
-#define	GW008_NRF24L01_INO
-#define	HISKY_NRF24L01_INO
+//#define	FY326_NRF24L01_INO
+//#define	GW008_NRF24L01_INO
+//#define	HISKY_NRF24L01_INO
 #define	HONTAI_NRF24L01_INO
 #define	H8_3D_NRF24L01_INO
 #define	JJRC345_NRF24L01_INO
@@ -576,10 +576,10 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]=	{
 		CABELL_SET_FAIL_SAFE
 		CABELL_UNBIND
 	PROTO_CFLIE
-    CFLIE_AUTO
-    CFLIE_2Mbps
+		CFLIE_AUTO
+		CFLIE_2Mbps
 		CFLIE_1Mbps
-    CFLIE_250kbps
+		CFLIE_250kbps
 	PROTO_CG023
 		CG023
 		YD829