From 8ac53657ec6609fbefe93d73e027485258ba7f10 Mon Sep 17 00:00:00 2001
From: pascallanger <pascal_langer@yahoo.fr>
Date: Tue, 30 Jan 2024 12:06:37 +0100
Subject: [PATCH] Kyosho updqte

fixed crash
---
 Multiprotocol/A7105_SPI.ino    | 8 ++++----
 Multiprotocol/Kyosho_a7105.ino | 8 ++++----
 Multiprotocol/Multiprotocol.h  | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Multiprotocol/A7105_SPI.ino b/Multiprotocol/A7105_SPI.ino
index 5a5927f..b6fe373 100644
--- a/Multiprotocol/A7105_SPI.ino
+++ b/Multiprotocol/A7105_SPI.ino
@@ -418,10 +418,10 @@ void A7105_Init(void)
 			#ifdef KYOSHO_A7105_INO
 				if(protocol==PROTO_KYOSHO)
 				{
-					if(sub_protocol==KYOSHO_FHSS || sub_protocol==KYOSHO_SYNCRO)
-						A7105_Regs=(uint8_t*)KYOSHO_A7105_regs;
-					else
+					if(sub_protocol==KYOSHO_HYPE)
 						A7105_Regs=(uint8_t*)KYOSHO_HYPE_A7105_regs;
+					else //FHSS && SYNCRO
+						A7105_Regs=(uint8_t*)KYOSHO_A7105_regs;
 				}
 			#endif
 		}
@@ -446,7 +446,7 @@ void A7105_Init(void)
 	}
 	A7105_Strobe(A7105_STANDBY);
 
-	if(protocol==PROTO_KYOSHO && (sub_protocol==KYOSHO_FHSS || sub_protocol==KYOSHO_SYNCRO))
+	if(protocol==PROTO_KYOSHO && sub_protocol!=KYOSHO_HYPE)
 	{//strange calibration...
 		//IF Filter Bank Calibration
 		A7105_WriteReg(A7105_02_CALC,0x0F);
diff --git a/Multiprotocol/Kyosho_a7105.ino b/Multiprotocol/Kyosho_a7105.ino
index 2618d09..90b8a1b 100644
--- a/Multiprotocol/Kyosho_a7105.ino
+++ b/Multiprotocol/Kyosho_a7105.ino
@@ -59,7 +59,7 @@ static void __attribute__((unused)) KYOSHO_send_packet()
 		packet[ 0]  = 0x58;						// normal packet
 		//FHSS  14 channels: steering, throttle, ...
 		//Syncro 6 channels: steering, throttle, ...
-		for(uint8_t i = 0; i < sub_protocol==KYOSHO_FHSS?14:6; i++)
+		for(uint8_t i = 0; i < (sub_protocol==KYOSHO_FHSS?14:6); i++)
 		{
 			uint16_t temp=convert_channel_ppm(i);
 			packet[9 + i*2]=temp&0xFF;			// low byte of servo timing(1000-2000us)
@@ -159,10 +159,10 @@ uint16_t KYOSHO_callback()
 			telemetry_set_input_sync(packet_period);
 		#endif
 	}
-	if(sub_protocol==KYOSHO_FHSS || sub_protocol==KYOSHO_SYNCRO)
-		KYOSHO_send_packet();
-	else//HYPE
+	if(sub_protocol==KYOSHO_HYPE)
 		KYOSHO_hype_send_packet();
+	else //FHSS && SYNCRO
+		KYOSHO_send_packet();
 	return packet_period;
 }
 
diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index 64ef8ee..91676a9 100644
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	3
-#define VERSION_PATCH_LEVEL	45
+#define VERSION_PATCH_LEVEL	46
 
 #define MODE_SERIAL 0