From fff3b8830e523f9e68591e563370c651a3e0b961 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Sun, 24 Oct 2021 11:04:44 +0200 Subject: [PATCH] MT99xx/A180: F949S flags for RATE, RXLED and 3D6G --- Multiprotocol/MT99xx_ccnrf.ino | 5 +++-- Multiprotocol/Multiprotocol.h | 2 +- Protocols_Details.md | 14 ++++++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Multiprotocol/MT99xx_ccnrf.ino b/Multiprotocol/MT99xx_ccnrf.ino index 1aa1c8e..1ba8611 100644 --- a/Multiprotocol/MT99xx_ccnrf.ino +++ b/Multiprotocol/MT99xx_ccnrf.ino @@ -198,8 +198,9 @@ static void __attribute__((unused)) MT99XX_send_packet() crc8=0; break; case A180: - packet[6] = FLAG_A180_RATE - | GET_FLAG( CH5_SW, FLAG_A180_3D6G ); + packet[6] = GET_FLAG( !CH6_SW,FLAG_A180_RATE) // 0x02, A180=RATE, F949S=LED + |GET_FLAG( CH5_SW, FLAG_A180_3D6G ) // 0x01, A180=3D_6G, F949S=RATE + |GET_FLAG( CH7_SW, 0x20 ); // 0x20, F949S=3D_6G packet[7] = 0x00; break; case DRAGON: diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 9439ed9..7869598 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 3 +#define VERSION_PATCH_LEVEL 4 #define MODE_SERIAL 0 diff --git a/Protocols_Details.md b/Protocols_Details.md index cbbd1d4..83a104c 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -1096,11 +1096,17 @@ CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9 A|E|T|R|FLIP||||HEADLESS ### Sub_protocol A180 - *5* -Model: XK A180 +Model: XK A180, F949S -CH1|CH2|CH3|CH4|CH5 ----|---|---|---|--- -A|E|T|R|3D6G +A180: +CH1|CH2|CH3|CH4|CH5|CH6 +---|---|---|---|---|--- +A|E|T|R|3D6G|RATE + +F949S: +CH1|CH2|CH3|CH4|CH5|CH6|CH7 +---|---|---|---|---|---|--- +A|E|T|R|RATE|RXLED|3D6G ### Sub_protocol DRAGON - *6* Model: Eachine Mini Wing Dragon