From d6291a4c4700691f6c59c4ea72c68377e065f443 Mon Sep 17 00:00:00 2001
From: pascallanger <planger@mathworks.com>
Date: Wed, 30 Nov 2016 17:02:09 +0100
Subject: [PATCH] Flysky/CX20 fix

---
 Multiprotocol/FlySky_a7105.ino | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Multiprotocol/FlySky_a7105.ino b/Multiprotocol/FlySky_a7105.ino
index b4d1237..8494aa3 100644
--- a/Multiprotocol/FlySky_a7105.ino
+++ b/Multiprotocol/FlySky_a7105.ino
@@ -195,14 +195,15 @@ uint16_t initFlySky()
 	
 	if ((rx_tx_addr[3]&0xF0) > 0x90) // limit offset to 9 as higher values don't work with some RX (ie V912)
 		rx_tx_addr[3]=rx_tx_addr[3]-0x70;
-	chanrow=rx_tx_addr[3] & 0x0F;
-	chanoffset=rx_tx_addr[3]/16;
-	
+
 	if(sub_protocol==CX20)
 	{//Haven't figured yet the relation between TX ID and Frequencies
 		memcpy(rx_tx_addr,"\x06\x35\x89\x72",4);
 	}
+	
 	// Build frequency hop table
+	chanrow=rx_tx_addr[3] & 0x0F;
+	chanoffset=rx_tx_addr[3]/16;
 	for(uint8_t i=0;i<16;i++)
 	{
 		temp=pgm_read_byte_near(&tx_channels[chanrow>>1][i>>2]);