From 4887fca8732e8427bbbfa845dd8e75965bff1078 Mon Sep 17 00:00:00 2001
From: Pascal Langer <planger@mathworks.com>
Date: Tue, 15 Dec 2020 09:51:11 +0100
Subject: [PATCH] WFLY2: fix bind after code cleanup...

---
 Multiprotocol/A7105_SPI.ino   |  2 +-
 Multiprotocol/Multiprotocol.h |  2 +-
 Multiprotocol/WFLY2_a7105.ino | 11 +++++++----
 Multiprotocol/_Config.h       |  3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Multiprotocol/A7105_SPI.ino b/Multiprotocol/A7105_SPI.ino
index 38950f6..91b5401 100644
--- a/Multiprotocol/A7105_SPI.ino
+++ b/Multiprotocol/A7105_SPI.ino
@@ -27,7 +27,7 @@ void A7105_WriteData(uint8_t len, uint8_t channel)
 	for (i = 0; i < len; i++)
 		SPI_Write(packet[i]);
 	A7105_CSN_on;
-	if(protocol!=PROTO_WFLY2)
+	if(protocol!=PROTO_WFLY2 || phase==0)
 	{
 		if(!(protocol==PROTO_FLYSKY || protocol==PROTO_KYOSHO))
 		{
diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index 4cfa5de..f9aa271 100644
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	1
-#define VERSION_PATCH_LEVEL	84
+#define VERSION_PATCH_LEVEL	85
 
 //******************
 // Protocols
diff --git a/Multiprotocol/WFLY2_a7105.ino b/Multiprotocol/WFLY2_a7105.ino
index b58b18f..9cc674a 100644
--- a/Multiprotocol/WFLY2_a7105.ino
+++ b/Multiprotocol/WFLY2_a7105.ino
@@ -153,7 +153,7 @@ static void __attribute__((unused)) WFLY2_build_packet()
 	}
 #endif
 
-#define WFLY2_PACKET_PERIOD	3600	//3600
+#define WFLY2_PACKET_PERIOD		3600	//3600
 #define WFLY2_BUFFER_TIME		1500	//1500
 #define WFLY2_WRITE_TIME		800		//942
 
@@ -171,15 +171,18 @@ uint16_t ReadWFLY2()
 	{
 		case WFLY2_BIND:
 			bind_counter--;
-			if (bind_counter == 0)
+			if (bind_counter)
+			{
+				WFLY2_send_bind_packet();
+				return WFLY2_PACKET_PERIOD;
+			}
+			else
 			{
 				BIND_DONE;
 				A7105_WriteID(MProtocol_id);
 				rf_ch_num = 0;
 				phase++;	// WFLY2_DATA
 			}
-			WFLY2_send_bind_packet();
-			return WFLY2_PACKET_PERIOD;
 
 		case WFLY2_DATA:
 			#ifdef MULTI_SYNC
diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h
index 93b0d40..1daf636 100644
--- a/Multiprotocol/_Config.h
+++ b/Multiprotocol/_Config.h
@@ -173,8 +173,9 @@
 #define	FLYSKY_A7105_INO
 #define	HEIGHT_A7105_INO
 #define	HUBSAN_A7105_INO
-#define KYOSHO_A7105_INO
+#define	KYOSHO_A7105_INO
 #define	PELIKAN_A7105_INO
+#define	WFLY2_A7105_INO
 
 //The protocols below need a CYRF6936 to be installed
 #define	DEVO_CYRF6936_INO