mirror of
https://github.com/EdgeTX/edgetx.git
synced 2025-07-22 07:45:12 +03:00
Multi protocol updates to MPM version 1.2.1.63
This commit is contained in:
parent
8cdcf565c2
commit
42f48680e1
5 changed files with 21 additions and 5 deletions
|
@ -104,7 +104,10 @@ enum MultiModuleRFProtocols {
|
||||||
MODULE_SUBTYPE_MULTI_V911S,
|
MODULE_SUBTYPE_MULTI_V911S,
|
||||||
MODULE_SUBTYPE_MULTI_GD00X,
|
MODULE_SUBTYPE_MULTI_GD00X,
|
||||||
MODULE_SUBTYPE_MULTI_V761,
|
MODULE_SUBTYPE_MULTI_V761,
|
||||||
MODULE_SUBTYPE_MULTI_LAST = MODULE_SUBTYPE_MULTI_V761
|
MODULE_SUBTYPE_MULTI_KF606,
|
||||||
|
MODULE_SUBTYPE_MULTI_REDPINE,
|
||||||
|
MODULE_SUBTYPE_MULTI_POTENSIC,
|
||||||
|
MODULE_SUBTYPE_MULTI_LAST = MODULE_SUBTYPE_MULTI_POTENSIC
|
||||||
};
|
};
|
||||||
|
|
||||||
enum TrainerProtocol {
|
enum TrainerProtocol {
|
||||||
|
|
|
@ -64,6 +64,8 @@ static const QStringList STR_SUBTYPE_HITEC {"Optima", "Optima Hub Telem", "M
|
||||||
static const QStringList STR_SUBTYPE_BUGS_MINI {"Standard", "Bugs 3H"};
|
static const QStringList STR_SUBTYPE_BUGS_MINI {"Standard", "Bugs 3H"};
|
||||||
static const QStringList STR_SUBTYPE_E01X {"E012", "E015", "E016H"};
|
static const QStringList STR_SUBTYPE_E01X {"E012", "E015", "E016H"};
|
||||||
static const QStringList STR_SUBTYPE_GD00X {"GD V1", "GD V2"};
|
static const QStringList STR_SUBTYPE_GD00X {"GD V1", "GD V2"};
|
||||||
|
static const QStringList STR_SUBTYPE_REDPINE {"Fast", "Slow"};
|
||||||
|
static const QStringList STR_SUBTYPE_POTENSIC {"A20 Firefly", " - "};
|
||||||
|
|
||||||
static const QStringList NO_SUBTYPE {STR_MULTI_DEFAULT};
|
static const QStringList NO_SUBTYPE {STR_MULTI_DEFAULT};
|
||||||
|
|
||||||
|
@ -100,7 +102,11 @@ const Multiprotocols multiProtocols {
|
||||||
{MODULE_SUBTYPE_MULTI_HITEC, 2, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE},
|
{MODULE_SUBTYPE_MULTI_HITEC, 2, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE},
|
||||||
{MODULE_SUBTYPE_MULTI_BUGS_MINI, 1, false, STR_SUBTYPE_BUGS_MINI, nullptr},
|
{MODULE_SUBTYPE_MULTI_BUGS_MINI, 1, false, STR_SUBTYPE_BUGS_MINI, nullptr},
|
||||||
{MODULE_SUBTYPE_MULTI_E01X, 2, false, STR_SUBTYPE_E01X, nullptr},
|
{MODULE_SUBTYPE_MULTI_E01X, 2, false, STR_SUBTYPE_E01X, nullptr},
|
||||||
|
{MODULE_SUBTYPE_MULTI_V911S, 0, false, NO_SUBTYPE, STR_MULTI_RFTUNE},
|
||||||
{MODULE_SUBTYPE_MULTI_GD00X, 1, false, STR_SUBTYPE_GD00X, nullptr},
|
{MODULE_SUBTYPE_MULTI_GD00X, 1, false, STR_SUBTYPE_GD00X, nullptr},
|
||||||
|
{MODULE_SUBTYPE_MULTI_KF606, 0, false, NO_SUBTYPE, STR_MULTI_RFTUNE},
|
||||||
|
{MODULE_SUBTYPE_MULTI_REDPINE, 1, false, STR_SUBTYPE_REDPINE, STR_MULTI_RFTUNE},
|
||||||
|
{MODULE_SUBTYPE_MULTI_POTENSIC, 1, false, STR_SUBTYPE_POTENSIC, nullptr},
|
||||||
{MM_RF_CUSTOM_SELECTED, 7, true, STR_SUBTYPE_CUSTOM, STR_MULTI_OPTION},
|
{MM_RF_CUSTOM_SELECTED, 7, true, STR_SUBTYPE_CUSTOM, STR_MULTI_OPTION},
|
||||||
|
|
||||||
// Sentinel and default for protocols not listed above (MM_RF_CUSTOM is 0xff)
|
// Sentinel and default for protocols not listed above (MM_RF_CUSTOM is 0xff)
|
||||||
|
@ -142,7 +148,8 @@ QString Multiprotocols::protocolToString(int protocol, bool custom)
|
||||||
"FlySky", "Hubsan", "FrSky", "Hisky", "V2x2", "DSM", "Devo", "YD717", "KN", "SymaX", "SLT", "CX10", "CG023",
|
"FlySky", "Hubsan", "FrSky", "Hisky", "V2x2", "DSM", "Devo", "YD717", "KN", "SymaX", "SLT", "CX10", "CG023",
|
||||||
"Bayang", "ESky", "MT99XX", "MJXQ", "Shenqi", "FY326", "SFHSS", "J6 PRO","FQ777","Assan","Hontai","Open LRS",
|
"Bayang", "ESky", "MT99XX", "MJXQ", "Shenqi", "FY326", "SFHSS", "J6 PRO","FQ777","Assan","Hontai","Open LRS",
|
||||||
"FlySky AFHDS2A", "Q2x2", "Walkera", "Q303", "GW008", "DM002", "Cabell", "ESky 150", "H8 3D", "Corona", "CFlie",
|
"FlySky AFHDS2A", "Q2x2", "Walkera", "Q303", "GW008", "DM002", "Cabell", "ESky 150", "H8 3D", "Corona", "CFlie",
|
||||||
"Hitec", "Wfly", "Bugs", "Bugs Mini", "Traxxas", "NCC-1701-A", "E01X", "V911S", "GD00X", "V761"
|
"Hitec", "Wfly", "Bugs", "Bugs Mini", "Traxxas", "NCC-1701-A", "E01X", "WL Heli V911S", "GD00X", "Volantex V761",
|
||||||
|
"KFPlan KF606", "Redpine", "Potensic"
|
||||||
});
|
});
|
||||||
|
|
||||||
if (protocol == MM_RF_CUSTOM_SELECTED || custom)
|
if (protocol == MM_RF_CUSTOM_SELECTED || custom)
|
||||||
|
|
|
@ -797,6 +797,8 @@ const char STR_SUBTYPE_HITEC[] = "\007""Optima\0""Opt Hub""Minima\0";
|
||||||
const char STR_SUBTYPE_BUGS_MINI[] = "\006"" Std\0 ""Bugs3H";
|
const char STR_SUBTYPE_BUGS_MINI[] = "\006"" Std\0 ""Bugs3H";
|
||||||
const char STR_SUBTYPE_E01X[] = "\005""E012\0""E015\0""E016H";
|
const char STR_SUBTYPE_E01X[] = "\005""E012\0""E015\0""E016H";
|
||||||
const char STR_SUBTYPE_GD00X[] = "\005""GD_V1""GD_V2";
|
const char STR_SUBTYPE_GD00X[] = "\005""GD_V1""GD_V2";
|
||||||
|
const char STR_SUBTYPE_REDPINE[] = "\005"" Fast"" Slow";
|
||||||
|
const char STR_SUBTYPE_POTENSIC[] = "\004"" A20"" -\0";
|
||||||
|
|
||||||
const mm_protocol_definition multi_protocols[] = {
|
const mm_protocol_definition multi_protocols[] = {
|
||||||
|
|
||||||
|
@ -829,9 +831,11 @@ const mm_protocol_definition multi_protocols[] = {
|
||||||
{MODULE_SUBTYPE_MULTI_HITEC, 2, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE},
|
{MODULE_SUBTYPE_MULTI_HITEC, 2, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE},
|
||||||
{MODULE_SUBTYPE_MULTI_BUGS_MINI, 1, false, STR_SUBTYPE_BUGS_MINI, nullptr},
|
{MODULE_SUBTYPE_MULTI_BUGS_MINI, 1, false, STR_SUBTYPE_BUGS_MINI, nullptr},
|
||||||
{MODULE_SUBTYPE_MULTI_E01X, 2, false, STR_SUBTYPE_E01X, nullptr},
|
{MODULE_SUBTYPE_MULTI_E01X, 2, false, STR_SUBTYPE_E01X, nullptr},
|
||||||
|
{MODULE_SUBTYPE_MULTI_V911S, 0, false, NO_SUBTYPE, STR_MULTI_RFTUNE},
|
||||||
{MODULE_SUBTYPE_MULTI_GD00X, 1, false, STR_SUBTYPE_GD00X, STR_MULTI_RFTUNE},
|
{MODULE_SUBTYPE_MULTI_GD00X, 1, false, STR_SUBTYPE_GD00X, STR_MULTI_RFTUNE},
|
||||||
{MODULE_SUBTYPE_MULTI_KF606, 0, false, NO_SUBTYPE, STR_MULTI_RFTUNE},
|
{MODULE_SUBTYPE_MULTI_KF606, 0, false, NO_SUBTYPE, STR_MULTI_RFTUNE},
|
||||||
{MODULE_SUBTYPE_MULTI_V911S, 0, false, NO_SUBTYPE, STR_MULTI_RFTUNE},
|
{MODULE_SUBTYPE_MULTI_REDPINE, 1, false, STR_SUBTYPE_REDPINE, STR_MULTI_RFTUNE},
|
||||||
|
{MODULE_SUBTYPE_MULTI_POTENSIC, 1, false, STR_SUBTYPE_POTENSIC, nullptr},
|
||||||
{MM_RF_CUSTOM_SELECTED, 7, true, NO_SUBTYPE, STR_MULTI_OPTION},
|
{MM_RF_CUSTOM_SELECTED, 7, true, NO_SUBTYPE, STR_MULTI_OPTION},
|
||||||
|
|
||||||
// Sentinel and default for protocols not listed above (MM_RF_CUSTOM is 0xff)
|
// Sentinel and default for protocols not listed above (MM_RF_CUSTOM is 0xff)
|
||||||
|
|
|
@ -114,7 +114,9 @@ enum ModuleSubtypeMulti {
|
||||||
MODULE_SUBTYPE_MULTI_GD00X,
|
MODULE_SUBTYPE_MULTI_GD00X,
|
||||||
MODULE_SUBTYPE_MULTI_V761,
|
MODULE_SUBTYPE_MULTI_V761,
|
||||||
MODULE_SUBTYPE_MULTI_KF606,
|
MODULE_SUBTYPE_MULTI_KF606,
|
||||||
MODULE_SUBTYPE_MULTI_LAST = MODULE_SUBTYPE_MULTI_KF606
|
MODULE_SUBTYPE_MULTI_REDPINE,
|
||||||
|
MODULE_SUBTYPE_MULTI_POTENSIC,
|
||||||
|
MODULE_SUBTYPE_MULTI_LAST = MODULE_SUBTYPE_MULTI_POTENSIC
|
||||||
};
|
};
|
||||||
|
|
||||||
enum MMDSM2Subtypes {
|
enum MMDSM2Subtypes {
|
||||||
|
|
|
@ -127,4 +127,4 @@
|
||||||
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
|
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
|
||||||
|
|
||||||
#define LEN_MULTI_PROTOCOLS "\006"
|
#define LEN_MULTI_PROTOCOLS "\006"
|
||||||
#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 ""BugMin""Traxas""NC1701""E01X\0 ""V911S\0""GD00X\0""V761\0 ""KF606\0"
|
#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXq\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OpnLrs""FS 2A\0""Q2x2\0 ""Walk.\0""Q303\0 ""GW008\0""DM002\0""Cabell""Esy150""H8 3D\0""Corona""CFlie\0""Hitec\0""WFly\0 ""Bugs\0 ""BugMin""Traxas""NC1701""E01X\0 ""V911S\0""GD00X\0""V761\0 ""KF606\0""Redpin""Potens"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue