From 770a12ffdf58dd8cd12d35b9a87fc87c6f23ea5b Mon Sep 17 00:00:00 2001 From: pascallanger Date: Thu, 8 Dec 2022 08:28:45 +0100 Subject: [PATCH] EU --- Multiprotocol/FrSkyX_cc2500.ino | 4 ++++ Multiprotocol/Multi_Protos.ino | 6 +++++- Multiprotocol/Multiprotocol.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Multiprotocol/FrSkyX_cc2500.ino b/Multiprotocol/FrSkyX_cc2500.ino index 5ce5997..cef0d63 100644 --- a/Multiprotocol/FrSkyX_cc2500.ino +++ b/Multiprotocol/FrSkyX_cc2500.ino @@ -116,6 +116,10 @@ static void __attribute__((unused)) FrSkyX_build_packet() uint16_t FRSKYX_callback() { + #if defined MULTI_EU + if(sub_protocol == CH_16 || sub_protocol == CH_8) + return 9000; + #endif switch(state) { default: diff --git a/Multiprotocol/Multi_Protos.ino b/Multiprotocol/Multi_Protos.ino index 6165dd9..9097782 100644 --- a/Multiprotocol/Multi_Protos.ino +++ b/Multiprotocol/Multi_Protos.ino @@ -109,7 +109,11 @@ const char STR_XERALL[] ="Xerall"; const char STR_SUBTYPE_FLYSKY[] = "\x04""Std\0""V9x9""V6x6""V912""CX20"; const char STR_SUBTYPE_HUBSAN[] = "\x04""H107""H301""H501"; const char STR_SUBTYPE_FRSKYD[] = "\x06""D8\0 ""Cloned"; -const char STR_SUBTYPE_FRSKYX[] = "\x07""D16\0 ""D16 8ch""LBT(EU)""LBT 8ch""Cloned\0""Clo 8ch"; +#ifndef MULTI_EU + const char STR_SUBTYPE_FRSKYX[] = "\x07""D16\0 ""D16 8ch""LBT(EU)""LBT 8ch""Cloned\0""Clo 8ch"; +#else + const char STR_SUBTYPE_FRSKYX[] = "\x07""--->\0 ""--->\0 ""LBT(EU)""LBT 8ch""Cloned\0""Clo 8ch"; +#endif const char STR_SUBTYPE_HISKY[] = "\x05""Std\0 ""HK310"; const char STR_SUBTYPE_V2X2[] = "\x06""Std\0 ""JXD506""MR101\0"; #ifndef MULTI_EU diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 0101c12..d866fd0 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 23 +#define VERSION_PATCH_LEVEL 24 #define MODE_SERIAL 0