From 75b7dd1dd76d0ce12ee547f9e148bf9a862eedd9 Mon Sep 17 00:00:00 2001
From: Pascal Langer <planger@mathworks.com>
Date: Thu, 1 Oct 2020 00:05:20 +0200
Subject: [PATCH] Kyosho/Hype: channel order & doc

---
 Multiprotocol/Kyosho_a7105.ino | 2 +-
 Multiprotocol/Multiprotocol.h  | 4 ++--
 Protocols_Details.md           | 9 ++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Multiprotocol/Kyosho_a7105.ino b/Multiprotocol/Kyosho_a7105.ino
index d5ecbe2..9defaca 100644
--- a/Multiprotocol/Kyosho_a7105.ino
+++ b/Multiprotocol/Kyosho_a7105.ino
@@ -106,7 +106,7 @@ static void __attribute__((unused)) kyosho_hype_send_packet()
 		//original TX is only refreshing the packet every 20ms and keep repeating the same packet in between (STROBE_TX) 
 		//build packet=6 channels with order AETR
 		for(uint8_t i=0;i<6;i++)
-			packet[i] = convert_channel_8b(i);
+			packet[i] = convert_channel_8b(CH_AETR[i]);
 		//set RF channel
 		rf_ch_num=hopping_frequency[hopping_frequency_no];
 		hopping_frequency_no++;
diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index 589aafd..6744a07 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	73
+#define VERSION_PATCH_LEVEL	74
 
 //******************
 // Protocols
@@ -447,7 +447,7 @@ enum MultiPacketTypes
 //***  Tests  ***
 //***************
 #define IS_FAILSAFE_PROTOCOL	( (protocol==PROTO_HISKY && sub_protocol==HK310) || protocol==PROTO_AFHDS2A || protocol==PROTO_DEVO || protocol==PROTO_SFHSS || protocol==PROTO_WK2x01 || protocol== PROTO_HOTT || protocol==PROTO_FRSKYX || protocol==PROTO_FRSKYX2 || protocol==PROTO_FRSKY_R9)
-#define IS_CHMAP_PROTOCOL		( (protocol==PROTO_HISKY && sub_protocol==HK310) || protocol==PROTO_AFHDS2A || protocol==PROTO_DEVO || protocol==PROTO_SFHSS || protocol==PROTO_WK2x01 || protocol== PROTO_DSM || protocol==PROTO_SLT || protocol==PROTO_FLYSKY || protocol==PROTO_ESKY || protocol==PROTO_J6PRO || protocol==PROTO_PELIKAN  || protocol==PROTO_SKYARTEC || protocol==PROTO_ESKY150V2 || protocol==PROTO_DSM_RX)
+#define IS_CHMAP_PROTOCOL		( (protocol==PROTO_HISKY && sub_protocol==HK310) || protocol==PROTO_AFHDS2A || protocol==PROTO_DEVO || protocol==PROTO_SFHSS || protocol==PROTO_WK2x01 || protocol== PROTO_DSM || protocol==PROTO_SLT || protocol==PROTO_FLYSKY || (protocol==PROTO_KYOSHO && sub_protocol==KYOSHO_HYPE) || protocol==PROTO_ESKY || protocol==PROTO_J6PRO || protocol==PROTO_PELIKAN  || protocol==PROTO_SKYARTEC || protocol==PROTO_ESKY150V2 || protocol==PROTO_DSM_RX)
 
 //***************
 //***  Flags  ***
diff --git a/Protocols_Details.md b/Protocols_Details.md
index c01d5a5..d37a9e8 100644
--- a/Protocols_Details.md
+++ b/Protocols_Details.md
@@ -163,7 +163,7 @@ CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8
 ---|---|---|---|---|---|---|---
 A|E|T|R|CH5|CH6|CH7|CH8
 
-Note that the RX ouput will be AETR.
+RX output will match the Flysky standard AETR independently of the input configuration AETR, RETA... unless on OpenTX 2.3.3+ you use the "Disable channel mapping" feature on the GUI.
 
 ### Sub_protocol Flysky - *0*
 
@@ -206,7 +206,7 @@ CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12|CH13|CH14
 ---|---|---|---|---|---|---|---|---|---|---|---|---|---
 A|E|T|R|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12|CH13|CH14
 
-Note that the RX ouput will be AETR whatever the input channel order is.
+RX output will match the Flysky standard AETR independently of the input configuration AETR, RETA... unless on OpenTX 2.3.3+ you use the "Disable channel mapping" feature on the GUI.
 
 ### Sub_protocol PWM_IBUS - *0*
 ### Sub_protocol PPM_IBUS - *1*
@@ -300,12 +300,15 @@ CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12|CH13|CH14
 STEERING|THROTTLE|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12|CH13|CH14
 
 ### Sub_protocol Hype - *1*
-Transmitter: ST6DF
+Transmitter: ST6DF, HK6S, Flightsport
+Receivers: ST6DF, HK6DF
 
 CH1|CH2|CH3|CH4|CH5|CH6
 ---|---|---|---|---|---
 A|E|T|R|CH5|CH6
 
+RX output will match the Hype standard AETR independently of the input configuration AETR, RETA... unless on OpenTX 2.3.3+ you use the "Disable channel mapping" feature on the GUI.
+
 ## Pelikan - *60*
 Extended limits supported