Fix FrSky RX protocol not ending bind when requested

Author: Pascal Langer

Multiprotocol/Multiprotocol.h

@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	1
-#define VERSION_PATCH_LEVEL	97
+#define VERSION_PATCH_LEVEL	98
 
 //******************
 // Protocols

Multiprotocol/Multiprotocol.ino

@@ -750,6 +750,18 @@ void loop()
 	}
 }
 
+void End_Bind()
+{
+	//Request protocol to terminate bind
+	#if defined(FRSKYD_CC2500_INO) || defined(FRSKYL_CC2500_INO) || defined(FRSKYX_CC2500_INO) || defined(FRSKYV_CC2500_INO) || defined(AFHDS2A_A7105_INO) || defined(FRSKYR9_SX1276_INO) || defined(DSM_RX_CYRF6936_INO) || defined(AFHDS2A_RX_A7105_INO) || defined(FRSKY_RX_CC2500_INO)
+	if(protocol==PROTO_FRSKYD || protocol==PROTO_FRSKYL || protocol==PROTO_FRSKYX || protocol==PROTO_FRSKYX2 || protocol==PROTO_FRSKYV || protocol==PROTO_AFHDS2A || protocol==PROTO_FRSKY_R9 || protocol==PROTO_DSM_RX || protocol==PROTO_AFHDS2A_RX || protocol==PROTO_FRSKY_RX)
+		BIND_DONE;
+	else
+	#endif
+		if(bind_counter>2)
+			bind_counter=2;
+}
+
 bool Update_All()
 {
 	#ifdef ENABLE_SERIAL
@@ -840,14 +852,7 @@ bool Update_All()
 		if(IS_AUTOBIND_FLAG_on && IS_BIND_CH_PREV_on && Channel_data[BIND_CH-1]<CHANNEL_MIN_COMMAND)
 		{ // Autobind is on and BIND_CH went down
 			BIND_CH_PREV_off;
-			//Request protocol to terminate bind
-			#if defined(FRSKYD_CC2500_INO) || defined(FRSKYL_CC2500_INO) || defined(FRSKYX_CC2500_INO) || defined(FRSKYV_CC2500_INO) || defined(AFHDS2A_A7105_INO) || defined(FRSKYR9_SX1276_INO)
-			if(protocol==PROTO_FRSKYD || protocol==PROTO_FRSKYL || protocol==PROTO_FRSKYX || protocol==PROTO_FRSKYX2 || protocol==PROTO_FRSKYV || protocol==PROTO_AFHDS2A || protocol==PROTO_FRSKY_R9)
-				BIND_DONE;
-			else
-			#endif
-			if(bind_counter>2)
-				bind_counter=2;
+			End_Bind();
 		}
 	#endif //ENABLE_BIND_CH
 	if(IS_CHANGE_PROTOCOL_FLAG_on)
@@ -1947,13 +1952,7 @@ void update_serial_data()
 		else
 			if( ((rx_ok_buff[1]&0x80)==0) && ((cur_protocol[1]&0x80)!=0) )	// Bind flag has been reset
 			{ // Request protocol to end bind
-				#if defined(FRSKYD_CC2500_INO) || defined(FRSKYL_CC2500_INO) || defined(FRSKYX_CC2500_INO) || defined(FRSKYV_CC2500_INO) || defined(AFHDS2A_A7105_INO) || defined(FRSKYR9_SX1276_INO) || defined(DSM_RX_CYRF6936_INO) || defined(AFHDS2A_RX_A7105_INO)
-				if(protocol==PROTO_FRSKYD || protocol==PROTO_FRSKYL || protocol==PROTO_FRSKYX || protocol==PROTO_FRSKYX2 || protocol==PROTO_FRSKYV || protocol==PROTO_AFHDS2A || protocol==PROTO_FRSKY_R9 || protocol==PROTO_DSM_RX || protocol==PROTO_AFHDS2A_RX)
-					BIND_DONE;
-				else
-				#endif
-				if(bind_counter>2)
-					bind_counter=2;
+				End_Bind();
 			}
 
 	//store current protocol values

Multiprotocol/_Config.h

@@ -229,7 +229,7 @@
 #define	JJRC345_NRF24L01_INO
 #define	KF606_NRF24L01_INO
 #define	KN_NRF24L01_INO
-#define LOLI_NRF24L01_INO
+#define	LOLI_NRF24L01_INO
 #define	MJXQ_NRF24L01_INO
 #define	MT99XX_NRF24L01_INO
 #define	NCC1701_NRF24L01_INO

Protocols_Details.md

@@ -606,7 +606,7 @@ Telemetry supported:
 - A2 = battery voltage from only good telemetry packets
 - How to calculate accurately the OpenTX Ratio and Offset:
 Set the Ratio to 12.7 and Offset to 0, plug 2 batteries with extreme voltage values, write down the values Batt1=12.5V & Telem1=12.2V, Batt2=7V & Telem2=6.6V then calculate/set Ratio=12.7*[(12.5-7)/(12.2-6.6)]=12.47 => 12.5 and Offset=12.5-12.2*[(12.5-7)/(12.2-6.6)]=0.517 => 0.5
-- RX_RSSI = TQly = percentage of received telemetry packets (good and corrupted) received from the model which has nothing to do with how well the RX is receiving the TX
+- RX_RSSI = TQly = percentage of received telemetry packets (good and corrupted) from the model which has nothing to do with how well the RX is receiving the TX
 
 Option for this protocol corresponds to the CC2500 fine frequency tuning. This value is different for each Module and **must** be accurate otherwise the link will not be stable.
 Check the [Frequency Tuning page](/docs/Frequency_Tuning.md) to determine it.
@@ -1286,11 +1286,11 @@ CH1|CH2|CH3|CH4|CH5
 A||T||TRIM
 
 ## LOLI - *82*
-LOLI receivers.
+LOLI3 receivers: https://github.com/wooddoor/Loli3
 
 Failsafe supported. Once failsafe values for the 8 channels have been configured in Custom mode, wait for the RX to learn them, then set Failsafe to Receiver.
 
-Telemetry supported: RX RSSI, TX LQI (percentage of received packets), A1 and A2.
+Telemetry supported: RX RSSI, TX LQI (percentage of received telemetry packets), A1 and A2.
 
 Extended limits supported.