From a23178e20e4cc939a420443db4fe9bb9cea4c8d3 Mon Sep 17 00:00:00 2001
From: pascallanger <pascal_langer@yahoo.fr>
Date: Sun, 13 Oct 2019 16:35:09 +0200
Subject: [PATCH] Fix ADHDS2A RX LNA switch

---
 Multiprotocol/AFHDS2A_Rx_a7105.ino | 8 ++++----
 Multiprotocol/FrSky_Rx_cc2500.ino  | 4 ++--
 Multiprotocol/Multiprotocol.ino    | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Multiprotocol/AFHDS2A_Rx_a7105.ino b/Multiprotocol/AFHDS2A_Rx_a7105.ino
index e1a7a65..992750c 100644
--- a/Multiprotocol/AFHDS2A_Rx_a7105.ino
+++ b/Multiprotocol/AFHDS2A_Rx_a7105.ino
@@ -67,9 +67,9 @@ uint16_t initAFHDS2A_Rx()
 	A7105_Init();
 	hopping_frequency_no = 0;
 	packet_count = 0;
-	rx_data_started = 0;
+	rx_data_started = false;
 	rx_disable_lna = IS_POWER_FLAG_on;
-	CC2500_SetTxRxMode(rx_disable_lna ? TXRX_OFF : RX_EN);
+	A7105_SetTxRxMode(rx_disable_lna ? TXRX_OFF : RX_EN);
 	A7105_Strobe(A7105_RX);
 
 	if (IS_BIND_IN_PROGRESS) {
@@ -101,7 +101,7 @@ uint16_t AFHDS2A_Rx_callback()
 #endif
 	if (rx_disable_lna != IS_POWER_FLAG_on) {
 		rx_disable_lna = IS_POWER_FLAG_on;
-		CC2500_SetTxRxMode(rx_disable_lna ? TXRX_OFF : RX_EN);
+		A7105_SetTxRxMode(rx_disable_lna ? TXRX_OFF : RX_EN);
 	}
 
 	switch(phase) {
@@ -169,7 +169,7 @@ uint16_t AFHDS2A_Rx_callback()
 					AFHDS2A_Rx_build_telemetry_packet();
 					telemetry_link = 1;
 				}
-				rx_data_started = 1;
+				rx_data_started = true;
 				read_retry = 10; // hop to next channel
 				pps_counter++;
 			}
diff --git a/Multiprotocol/FrSky_Rx_cc2500.ino b/Multiprotocol/FrSky_Rx_cc2500.ino
index cd2d242..e05c47e 100644
--- a/Multiprotocol/FrSky_Rx_cc2500.ino
+++ b/Multiprotocol/FrSky_Rx_cc2500.ino
@@ -166,7 +166,7 @@ uint16_t initFrSky_Rx()
 	state = 0;
 	frsky_rx_chanskip = 1;
 	hopping_frequency_no = 0;
-	rx_data_started = 0;
+	rx_data_started = false;
 	frsky_rx_finetune = 0;
 	telemetry_link = 0;
 	if (IS_BIND_IN_PROGRESS) {
@@ -329,7 +329,7 @@ uint16_t FrSky_Rx_callback()
 						frsky_rx_build_telemetry_packet();
 						telemetry_link = 1;
 				}
-				rx_data_started = 1;
+				rx_data_started = true;
 				read_retry = 0;
 				pps_counter++;
 			}
diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino
index f4392c4..6ed1cd8 100644
--- a/Multiprotocol/Multiprotocol.ino
+++ b/Multiprotocol/Multiprotocol.ino
@@ -220,8 +220,8 @@ uint8_t packet_in[TELEMETRY_BUFFER_SIZE];//telemetry receiving packets
 
 	//RX protocols
 	#if defined(AFHDS2A_RX_A7105_INO) || defined(FRSKY_RX_CC2500_INO)
-		uint8_t rx_data_started;
-		uint8_t rx_disable_lna;
+		bool rx_data_started;
+		bool rx_disable_lna;
 		uint16_t rx_rc_chan[16];
 	#endif
 #endif // TELEMETRY