From 9c3c6c3ed182f7fb6bf12c13e3398f844111bf6a Mon Sep 17 00:00:00 2001 From: Michael <101.37584@germanynet.de> Date: Wed, 5 Apr 2023 11:14:40 +0200 Subject: [PATCH] same as CpnSimMPMSingleSOurce but based on 2.8.2 --- .../src/firmwares/edgetx/yaml_moduledata.cpp | 31 +-- companion/src/firmwares/moduledata.h | 96 +------ companion/src/firmwares/multiprotocols.cpp | 171 +----------- companion/src/firmwares/multiprotocols.h | 3 + companion/src/modeledit/setup.cpp | 11 +- radio/src/MultiProtoDefs.h | 138 ++++++++++ radio/src/MultiSubtypeDefs.h | 250 ++++++++++++++++++ radio/src/gui/colorlcd/module_setup.cpp | 2 + radio/src/gui/gui_common.cpp | 173 +----------- radio/src/pulses/modules_constants.h | 100 ------- radio/src/pulses/modules_helpers.h | 1 + radio/src/translations/untranslated.h | 10 +- 12 files changed, 419 insertions(+), 567 deletions(-) create mode 100644 radio/src/MultiProtoDefs.h create mode 100644 radio/src/MultiSubtypeDefs.h diff --git a/companion/src/firmwares/edgetx/yaml_moduledata.cpp b/companion/src/firmwares/edgetx/yaml_moduledata.cpp index ff9c4a5a5eb..4996f0c443d 100644 --- a/companion/src/firmwares/edgetx/yaml_moduledata.cpp +++ b/companion/src/firmwares/edgetx/yaml_moduledata.cpp @@ -114,25 +114,25 @@ enum MMRFrskySubtypes { // from radio/src/pulses/multi.cpp static void convertMultiProtocolToEtx(int *protocol, int *subprotocol) { - if (*protocol == 3 && *subprotocol == 0) { + if (*protocol == (MODULE_SUBTYPE_MULTI_FRSKY + 1) && *subprotocol == 0) { *protocol = MODULE_SUBTYPE_MULTI_FRSKY + 1; *subprotocol = MM_RF_FRSKY_SUBTYPE_D8; return; } - if (*protocol == 3 && *subprotocol == 1) { + if (*protocol == (MODULE_SUBTYPE_MULTI_FRSKY + 1) && *subprotocol == 1) { *protocol = MODULE_SUBTYPE_MULTI_FRSKY + 1; *subprotocol = MM_RF_FRSKY_SUBTYPE_D8_CLONED; return; } - if (*protocol == 25) { + if (*protocol == (MODULE_SUBTYPE_MULTI_FRSKYV + 1)) { *protocol = MODULE_SUBTYPE_MULTI_FRSKY + 1; *subprotocol = MM_RF_FRSKY_SUBTYPE_V8; return; } - if (*protocol == 15) { + if (*protocol == (MODULE_SUBTYPE_MULTI_FRSKYX + 1)) { *protocol = MODULE_SUBTYPE_MULTI_FRSKY + 1; if (*subprotocol == 0) @@ -148,12 +148,6 @@ static void convertMultiProtocolToEtx(int *protocol, int *subprotocol) return; } - - if (*protocol >= 25) - *protocol -= 1; - - if (*protocol >= 16) - *protocol -= 1; } void convertEtxProtocolToMulti(int *protocol, int *subprotocol) @@ -162,21 +156,21 @@ void convertEtxProtocolToMulti(int *protocol, int *subprotocol) if (*protocol == MODULE_SUBTYPE_MULTI_FRSKY + 1) { if (*subprotocol == MM_RF_FRSKY_SUBTYPE_D8) { //D8 - *protocol = 3; + *protocol = MODULE_SUBTYPE_MULTI_FRSKY + 1; *subprotocol = 0; } else if (*subprotocol == MM_RF_FRSKY_SUBTYPE_D8_CLONED) { //D8 - *protocol = 3; + *protocol = MODULE_SUBTYPE_MULTI_FRSKY + 1; *subprotocol = 1; } else if (*subprotocol == MM_RF_FRSKY_SUBTYPE_V8) { //V8 - *protocol = 25; + *protocol = MODULE_SUBTYPE_MULTI_FRSKYV+1; *subprotocol = 0; } else { - *protocol = 15; + *protocol = MODULE_SUBTYPE_MULTI_FRSKYX + 1; if (*subprotocol == MM_RF_FRSKY_SUBTYPE_D16_8CH) *subprotocol = 1; else if (*subprotocol == MM_RF_FRSKY_SUBTYPE_D16) @@ -189,15 +183,6 @@ void convertEtxProtocolToMulti(int *protocol, int *subprotocol) *subprotocol = 4; // D16_CLONED } } - else { - // 15 for Multimodule is FrskyX or D16 which we map as a protocol of 3 (FrSky) - // all protos > frskyx are therefore also off by one - if (*protocol >= 15) - *protocol += 1; - // 25 is again a FrSky *protocol (FrskyV) so shift again - if (*protocol >= 25) - *protocol += 1; - } } static int exportPpmDelay(int delay) { return (delay - 300) / 50; } diff --git a/companion/src/firmwares/moduledata.h b/companion/src/firmwares/moduledata.h index 70dd0c743e0..45b8ed894a2 100644 --- a/companion/src/firmwares/moduledata.h +++ b/companion/src/firmwares/moduledata.h @@ -21,6 +21,7 @@ #pragma once #include "constants.h" +#include "radio/src/MultiProtoDefs.h" #include @@ -88,101 +89,6 @@ enum PulsesProtocol { PULSES_PROTOCOL_LAST }; -enum MultiModuleRFProtocols { - MODULE_SUBTYPE_MULTI_FLYSKY=0, - MODULE_SUBTYPE_MULTI_FIRST=MODULE_SUBTYPE_MULTI_FLYSKY, - MODULE_SUBTYPE_MULTI_HUBSAN, - MODULE_SUBTYPE_MULTI_FRSKY, - MODULE_SUBTYPE_MULTI_HISKY, - MODULE_SUBTYPE_MULTI_V2X2, - MODULE_SUBTYPE_MULTI_DSM2, - MODULE_SUBTYPE_MULTI_DEVO, - MODULE_SUBTYPE_MULTI_YD717, - MODULE_SUBTYPE_MULTI_KN, - MODULE_SUBTYPE_MULTI_SYMAX, - MODULE_SUBTYPE_MULTI_SLT, - MODULE_SUBTYPE_MULTI_CX10, - MODULE_SUBTYPE_MULTI_CG023, - MODULE_SUBTYPE_MULTI_BAYANG, - MODULE_SUBTYPE_MULTI_ESky, - MODULE_SUBTYPE_MULTI_MT99XX, - MODULE_SUBTYPE_MULTI_MJXQ, - MODULE_SUBTYPE_MULTI_SHENQI, - MODULE_SUBTYPE_MULTI_FY326, - MODULE_SUBTYPE_MULTI_FUTABA, - MODULE_SUBTYPE_MULTI_J6PRO, - MODULE_SUBTYPE_MULTI_FQ777, - MODULE_SUBTYPE_MULTI_ASSAN, - MODULE_SUBTYPE_MULTI_HONTAI, - MODULE_SUBTYPE_MULTI_OLRS, - MODULE_SUBTYPE_MULTI_FS_AFHDS2A, - MODULE_SUBTYPE_MULTI_Q2X2, - MODULE_SUBTYPE_MULTI_WK_2X01, - MODULE_SUBTYPE_MULTI_Q303, - MODULE_SUBTYPE_MULTI_GW008, - MODULE_SUBTYPE_MULTI_DM002, - MODULE_SUBTYPE_MULTI_CABELL, - MODULE_SUBTYPE_MULTI_ESKY150, - MODULE_SUBTYPE_MULTI_H83D, - MODULE_SUBTYPE_MULTI_CORONA, - MODULE_SUBTYPE_MULTI_CFLIE, - MODULE_SUBTYPE_MULTI_HITEC, - MODULE_SUBTYPE_MULTI_WFLY, - MODULE_SUBTYPE_MULTI_BUGS, - MODULE_SUBTYPE_MULTI_BUGS_MINI, - MODULE_SUBTYPE_MULTI_TRAXXAS, - MODULE_SUBTYPE_MULTI_NCC1701, - MODULE_SUBTYPE_MULTI_E01X, - MODULE_SUBTYPE_MULTI_V911S, - MODULE_SUBTYPE_MULTI_GD00X, - MODULE_SUBTYPE_MULTI_V761, - MODULE_SUBTYPE_MULTI_KF606, - MODULE_SUBTYPE_MULTI_REDPINE, - MODULE_SUBTYPE_MULTI_POTENSIC, - MODULE_SUBTYPE_MULTI_ZSX, - MODULE_SUBTYPE_MULTI_HEIGHT, - MODULE_SUBTYPE_MULTI_SCANNER, - MODULE_SUBTYPE_MULTI_FRSKYX_RX, - MODULE_SUBTYPE_MULTI_AFHDS2A_RX, - MODULE_SUBTYPE_MULTI_HOTT, - MODULE_SUBTYPE_MULTI_FX816, - MODULE_SUBTYPE_MULTI_BAYANG_RX, - MODULE_SUBTYPE_MULTI_PELIKAN, - MODULE_SUBTYPE_MULTI_TIGER, - MODULE_SUBTYPE_MULTI_XK, - MODULE_SUBTYPE_MULTI_XN297DUMP, - MODULE_SUBTYPE_MULTI_FRSKYX2, - MODULE_SUBTYPE_MULTI_FRSKY_R9, - MODULE_SUBTYPE_MULTI_PROPEL, - MODULE_SUBTYPE_MULTI_FRSKYL, - MODULE_SUBTYPE_MULTI_SKYARTEC, - MODULE_SUBTYPE_MULTI_ESKY150V2, - MODULE_SUBTYPE_MULTI_DSM_RX, - MODULE_SUBTYPE_MULTI_JJRC345, - MODULE_SUBTYPE_MULTI_Q90C, - MODULE_SUBTYPE_MULTI_KYOSHO, - MODULE_SUBTYPE_MULTI_RLINK, - MODULE_SUBTYPE_MULTI_ELRS, - MODULE_SUBTYPE_MULTI_REALACC, - MODULE_SUBTYPE_MULTI_OMP, - MODULE_SUBTYPE_MULTI_MLINK, - MODULE_SUBTYPE_MULTI_WFLY2, - MODULE_SUBTYPE_MULTI_E016HV2, - MODULE_SUBTYPE_MULTI_E010R5, - MODULE_SUBTYPE_MULTI_LOLI, - MODULE_SUBTYPE_MULTI_E129, - MODULE_SUBTYPE_MULTI_JOYSWAY, - MODULE_SUBTYPE_MULTI_E016H, - MODULE_SUBTYPE_MULTI_CONFIG, - MODULE_SUBTYPE_MULTI_IKEAANSLUTA, - MODULE_SUBTYPE_MULTI_WILLIFM, - MODULE_SUBTYPE_MULTI_LOSI, - MODULE_SUBTYPE_MULTI_MOULDKG, - MODULE_SUBTYPE_MULTI_XERALL, - MODULE_SUBTYPE_MULTI_MT99XX2, - MODULE_SUBTYPE_MULTI_LAST = MODULE_SUBTYPE_MULTI_MT99XX2 -}; - enum ModuleSubtypeR9M { MODULE_SUBTYPE_R9M_FCC, MODULE_SUBTYPE_R9M_EU, diff --git a/companion/src/firmwares/multiprotocols.cpp b/companion/src/firmwares/multiprotocols.cpp index 6a3f4bb99ff..3190d69ae1d 100644 --- a/companion/src/firmwares/multiprotocols.cpp +++ b/companion/src/firmwares/multiprotocols.cpp @@ -23,163 +23,10 @@ #include "multiprotocols.h" #include "radiodata.h" -#define STR_MULTI_SUBTYPE QT_TRANSLATE_NOOP("Multiprotocols", "Subtype") -#define STR_MULTI_VIDFREQ QT_TRANSLATE_NOOP("Multiprotocols", "Video TX frequency") -#define STR_MULTI_RFTUNE QT_TRANSLATE_NOOP("Multiprotocols", "CC2500 frequency fine tune") -#define STR_MULTI_RFPOWER QT_TRANSLATE_NOOP("Multiprotocols", "RF power") -#define STR_MULTI_TELEMETRY QT_TRANSLATE_NOOP("Multiprotocols", "Telemetry") -#define STR_MULTI_SERVOFREQ QT_TRANSLATE_NOOP("Multiprotocols", "Servo output frequency") -#define STR_MULTI_OPTION QT_TRANSLATE_NOOP("Multiprotocols", "Option value") -#define STR_MULTI_FIXEDID QT_TRANSLATE_NOOP("Multiprotocols", "Fixed ID value") -#define STR_MULTI_MAX_THROW QT_TRANSLATE_NOOP("Multiprotocols", "Enable Max Throw") -#define STR_MULTI_RFCHAN QT_TRANSLATE_NOOP("Multiprotocols", "RF Channel Number") -#define STR_MULTI_DEFAULT QT_TRANSLATE_NOOP("Multiprotocols", "DEFAULT") +#define CPN +#include "radio/src/MultiSubtypeDefs.h" +#undef CPN -static const QStringList STR_SUBTYPE_CUSTOM ({ - STR_MULTI_SUBTYPE " 0", STR_MULTI_SUBTYPE " 1", STR_MULTI_SUBTYPE " 2", STR_MULTI_SUBTYPE " 3", - STR_MULTI_SUBTYPE " 4", STR_MULTI_SUBTYPE " 5", STR_MULTI_SUBTYPE " 6", STR_MULTI_SUBTYPE " 7" - }); -static const QStringList STR_SUBTYPE_FLYSKY {"Standard", "V9x9", "V6x6", "V912", "CX20"}; -static const QStringList STR_SUBTYPE_HUBSAN {"H107", "H301", "H501"}; -static const QStringList STR_SUBTYPE_FRSKY {"D16", "D8", "D16 8ch", "V8", "D16 EU-LBT", "D16 EU-LBT 8ch", "D8 Cloned", "D16 Cloned"}; -static const QStringList STR_SUBTYPE_HISKY {"Standard", "HK310"}; -static const QStringList STR_SUBTYPE_V2X2 {"Standard", "JXD506", "MR101"}; -static const QStringList STR_SUBTYPE_DSM {"DSM2 1F", "DSM2 2F", "DSMX 1F", "DSMX 2F", "Auto", "DSMR 1F"}; -static const QStringList STR_SUBTYPE_DEVO {"8 Channel", "10 Channel", "12 Channel", "6 Channel", "7 Channel"}; -static const QStringList STR_SUBTYPE_YD717 {"Standard", "Skywalker", "Syma X4", "XINXUN", "NIHUI"}; -static const QStringList STR_SUBTYPE_KN {"WLtoys", "FeiLun"}; -static const QStringList STR_SUBTYPE_SYMAX {"Standard", "Syma X5C"}; -static const QStringList STR_SUBTYPE_SLT {"V1 (6 Channel)", "V2 (8 Channel)", "Q100", "Q200", "MR100"}; -static const QStringList STR_SUBTYPE_CX10 {"Green", "Blue", "DM007", "-", "JC3015a", "JC3015b", "MK33041"}; -static const QStringList STR_SUBTYPE_CG023 {"Standard", "YD829"}; -static const QStringList STR_SUBTYPE_BAYANG {"Standard", "H8S3D", "X16 AH", "IRDRONE", "DHD D4", "QX100"}; -static const QStringList STR_SUBTYPE_ESky {"Standard", "ET4"}; -static const QStringList STR_SUBTYPE_MT99 {"MT99", "H7", "YZ", "LS", "FY805", "A180", "Dragon", "F949G"}; -static const QStringList STR_SUBTYPE_MJXQ {"WLH08", "X600", "X800", "H26D", "E010", "H26WH", "Phoenix"}; -static const QStringList STR_SUBTYPE_FY326 {"Standard", "FY319"}; -static const QStringList STR_SUBTYPE_FUTABA {"SFHSS"}; -static const QStringList STR_SUBTYPE_HONTAI {"Standard", "JJRC X1", "X5C1 Clone", "FQ777_951"}; -static const QStringList STR_SUBTYPE_AFHDS2A {"PWM and IBUS", "PPM and IBUS", "PWM and SBUS", "PPM and SBUS", "PWM and IBUS16", "PPM and IBUS16"}; -static const QStringList STR_SUBTYPE_Q2X2 {"Q222", "Q242", "Q282"}; -static const QStringList STR_SUBTYPE_WK2x01 {"WK2801", "WK2401", "W6_5_1", "W6_6_1", "W6_HEL", "W6_HEL_I"}; -static const QStringList STR_SUBTYPE_Q303 {"Standard", "CX35", "CX10D", "CX10WD"}; -static const QStringList STR_SUBTYPE_CABELL {"Cabell V3", "Cab V3 Telem", "-", "-", "-", "-", "Set FailSafe", "Unbind"}; -static const QStringList STR_SUBTYPE_ESKY150 {"4 Channel", "7 Channel"}; -static const QStringList STR_SUBTYPE_H83D {"H8 Mini 3D", "H20H", "H20 Mini", "H30 Mini"}; -static const QStringList STR_SUBTYPE_CORONA {"Corona V1", "Corona V2", "Flydream V3"}; -static const QStringList STR_SUBTYPE_HITEC {"Optima", "Optima Hub Telem", "Minima"}; -static const QStringList STR_SUBTYPE_WFLY {"WFR0x"}; -static const QStringList STR_SUBTYPE_BUGS_MINI {"Standard", "Bugs 3H"}; -static const QStringList STR_SUBTYPE_TRAXXAS {"6519 RX"}; -static const QStringList STR_SUBTYPE_E01X {"E012", "E015"}; -static const QStringList STR_SUBTYPE_V911S {"Standard", "E119"}; -static const QStringList STR_SUBTYPE_GD00X {"GD V1", "GD V2"}; -static const QStringList STR_SUBTYPE_V761 {"3 Channel", "4 Channel"}; -static const QStringList STR_SUBTYPE_KF606 {"Standard", "MIG320"}; -static const QStringList STR_SUBTYPE_REDPINE {"Fast", "Slow"}; -static const QStringList STR_SUBTYPE_POTENSIC {"A20 Firefly"}; -static const QStringList STR_SUBTYPE_ZSX {"JJRC ZSX-280"}; -static const QStringList STR_SUBTYPE_HEIGHT {"5 Channel", "8 Channel"}; -static const QStringList STR_SUBTYPE_FRSKYX_RX {"RX", "Clone TX"}; -static const QStringList STR_SUBTYPE_HOTT {"Sync", "No_Sync"}; -static const QStringList STR_SUBTYPE_FX816 {"P38"}; -static const QStringList STR_SUBTYPE_PELIKAN {"Pro", "Lite", "SCX24"}; -static const QStringList STR_SUBTYPE_XK {"X450", "X420"}; -static const QStringList STR_SUBTYPE_XN297DUMP {"250K", "1M", "2M", "AUTO", "NRF","CC2500"}; -static const QStringList STR_SUBTYPE_FRSKYX2 {"D16", "D16 8ch", "D16 EU-LBT", "D16 EU-LBT 8ch", "Cloned", "Cloned 8ch"}; -static const QStringList STR_SUBTYPE_FRSKYR9 {"915 MHz", "868 MHz", "915 MHz 8-Channel", "868 MHz 8-Channel", "FCC", "---", "FCC 8-Channel"}; -static const QStringList STR_SUBTYPE_PROPEL {"74-Z"}; -static const QStringList STR_SUBTYPE_FRSKYL {"LR12", "LR12 6-Channel"}; -static const QStringList STR_SUBTYPE_ESKY150V2 {"150 V2"}; -static const QStringList STR_SUBTYPE_JJRC345 {"Standard", "SkyTumbler"}; -static const QStringList STR_SUBTYPE_KYOSHO {"FHSS", "Hype"}; -static const QStringList STR_SUBTYPE_RLINK {"Surface", "Air", "DumboRC"}; -static const QStringList STR_SUBTYPE_ELRS {"Not Available WIP"}; -static const QStringList STR_SUBTYPE_REALACC {"R11"}; -static const QStringList STR_SUBTYPE_WFLY2 {"RF20x"}; -static const QStringList STR_SUBTYPE_MOULDKG {"Analog", "Digital"}; -static const QStringList STR_SUBTYPE_MT992 {"PA18"}; - -static const QStringList NO_SUBTYPE {STR_MULTI_DEFAULT}; - - -// Table is designed to be shared with gui_common_arm.cpp - -const Multiprotocols multiProtocols { - {MODULE_SUBTYPE_MULTI_FLYSKY, 4, false, STR_SUBTYPE_FLYSKY, nullptr}, - {MODULE_SUBTYPE_MULTI_HUBSAN, 2, false, STR_SUBTYPE_HUBSAN, STR_MULTI_VIDFREQ}, - {MODULE_SUBTYPE_MULTI_FRSKY, 7, false, STR_SUBTYPE_FRSKY, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_HISKY, 1, false, STR_SUBTYPE_HISKY, nullptr}, - {MODULE_SUBTYPE_MULTI_V2X2, 2, false, STR_SUBTYPE_V2X2, nullptr}, - {MODULE_SUBTYPE_MULTI_DSM2, 5, false, STR_SUBTYPE_DSM, STR_MULTI_MAX_THROW}, - {MODULE_SUBTYPE_MULTI_DEVO, 4, false, STR_SUBTYPE_DEVO, STR_MULTI_FIXEDID}, - {MODULE_SUBTYPE_MULTI_YD717, 4, false, STR_SUBTYPE_YD717, nullptr}, - {MODULE_SUBTYPE_MULTI_KN, 1, false, STR_SUBTYPE_KN, nullptr}, - {MODULE_SUBTYPE_MULTI_SYMAX, 1, false, STR_SUBTYPE_SYMAX, nullptr}, - {MODULE_SUBTYPE_MULTI_SLT, 4, false, STR_SUBTYPE_SLT, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_CX10, 6, false, STR_SUBTYPE_CX10, nullptr}, - {MODULE_SUBTYPE_MULTI_CG023, 1, false, STR_SUBTYPE_CG023, nullptr}, - {MODULE_SUBTYPE_MULTI_BAYANG, 5, false, STR_SUBTYPE_BAYANG, STR_MULTI_TELEMETRY}, - {MODULE_SUBTYPE_MULTI_ESky, 1, false, STR_SUBTYPE_ESky, nullptr}, - {MODULE_SUBTYPE_MULTI_MT99XX, 7, false, STR_SUBTYPE_MT99, nullptr}, - {MODULE_SUBTYPE_MULTI_MJXQ, 6, false, STR_SUBTYPE_MJXQ, nullptr}, - {MODULE_SUBTYPE_MULTI_FY326, 1, false, STR_SUBTYPE_FY326, nullptr}, - {MODULE_SUBTYPE_MULTI_FUTABA, 0, true, STR_SUBTYPE_FUTABA, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_J6PRO, 0, false, NO_SUBTYPE, nullptr}, - {MODULE_SUBTYPE_MULTI_HONTAI, 3, false, STR_SUBTYPE_HONTAI, nullptr}, - {MODULE_SUBTYPE_MULTI_OLRS, 0, false, NO_SUBTYPE, STR_MULTI_RFPOWER}, - {MODULE_SUBTYPE_MULTI_FS_AFHDS2A, 5, true, STR_SUBTYPE_AFHDS2A, STR_MULTI_SERVOFREQ}, - {MODULE_SUBTYPE_MULTI_Q2X2, 2, false, STR_SUBTYPE_Q2X2, nullptr}, - {MODULE_SUBTYPE_MULTI_WK_2X01, 5, false, STR_SUBTYPE_WK2x01, nullptr}, - {MODULE_SUBTYPE_MULTI_Q303, 3, false, STR_SUBTYPE_Q303, nullptr}, - {MODULE_SUBTYPE_MULTI_CABELL, 7, false, STR_SUBTYPE_CABELL, STR_MULTI_OPTION}, - {MODULE_SUBTYPE_MULTI_ESKY150, 1, false, STR_SUBTYPE_ESKY150, nullptr}, - {MODULE_SUBTYPE_MULTI_H83D, 3, false, STR_SUBTYPE_H83D, nullptr}, - {MODULE_SUBTYPE_MULTI_CORONA, 2, false, STR_SUBTYPE_CORONA, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_HITEC, 2, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_WFLY, 0, false, STR_SUBTYPE_WFLY, nullptr}, - {MODULE_SUBTYPE_MULTI_BUGS_MINI, 1, false, STR_SUBTYPE_BUGS_MINI, nullptr}, - {MODULE_SUBTYPE_MULTI_TRAXXAS, 0, false, STR_SUBTYPE_TRAXXAS, nullptr}, - {MODULE_SUBTYPE_MULTI_E01X, 1, false, STR_SUBTYPE_E01X, nullptr}, - {MODULE_SUBTYPE_MULTI_V911S, 1, false, STR_SUBTYPE_V911S, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_GD00X, 1, false, STR_SUBTYPE_GD00X, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_V761, 1, false, STR_SUBTYPE_V761, nullptr}, - {MODULE_SUBTYPE_MULTI_KF606, 1, false, STR_SUBTYPE_KF606, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_REDPINE, 1, false, STR_SUBTYPE_REDPINE, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_POTENSIC, 0, false, STR_SUBTYPE_POTENSIC, nullptr}, - {MODULE_SUBTYPE_MULTI_ZSX, 0, false, STR_SUBTYPE_ZSX, nullptr}, - {MODULE_SUBTYPE_MULTI_HEIGHT, 1, false, STR_SUBTYPE_HEIGHT, nullptr}, - {MODULE_SUBTYPE_MULTI_FRSKYX_RX, 1, false, STR_SUBTYPE_FRSKYX_RX, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_HOTT, 1, true, STR_SUBTYPE_HOTT, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_FX816, 0, false, STR_SUBTYPE_FX816, nullptr}, - {MODULE_SUBTYPE_MULTI_PELIKAN, 2, false, STR_SUBTYPE_PELIKAN, nullptr}, - {MODULE_SUBTYPE_MULTI_XK, 1, false, STR_SUBTYPE_XK, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_XN297DUMP, 5, false, STR_SUBTYPE_XN297DUMP, STR_MULTI_RFCHAN}, - {MODULE_SUBTYPE_MULTI_FRSKYX2, 5, true, STR_SUBTYPE_FRSKYX2, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_FRSKY_R9, 6, true, STR_SUBTYPE_FRSKYR9, nullptr}, - {MODULE_SUBTYPE_MULTI_PROPEL, 0, false, STR_SUBTYPE_PROPEL, nullptr}, - {MODULE_SUBTYPE_MULTI_FRSKYL, 1, false, STR_SUBTYPE_FRSKYL, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_SKYARTEC, 0, false, NO_SUBTYPE, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_ESKY150V2, 0, false, STR_SUBTYPE_ESKY150V2, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_JJRC345, 1, false, STR_SUBTYPE_JJRC345, nullptr}, - {MODULE_SUBTYPE_MULTI_Q90C, 0, false, NO_SUBTYPE, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_KYOSHO, 1, false, STR_SUBTYPE_KYOSHO, nullptr}, - {MODULE_SUBTYPE_MULTI_RLINK, 2, false, STR_SUBTYPE_RLINK, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_ELRS, 0, false, STR_SUBTYPE_ELRS, nullptr}, - {MODULE_SUBTYPE_MULTI_REALACC, 0, false, STR_SUBTYPE_REALACC, nullptr}, - {MODULE_SUBTYPE_MULTI_OMP, 0, false, NO_SUBTYPE, nullptr}, - {MODULE_SUBTYPE_MULTI_MLINK, 0, true, NO_SUBTYPE, nullptr}, - {MODULE_SUBTYPE_MULTI_WFLY2, 0, false, STR_SUBTYPE_WFLY2, STR_MULTI_OPTION}, - {MODULE_SUBTYPE_MULTI_E016HV2, 0, false, NO_SUBTYPE, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_LOLI, 0, true, NO_SUBTYPE, nullptr}, - {MODULE_SUBTYPE_MULTI_MOULDKG, 1, false, STR_SUBTYPE_MOULDKG, STR_MULTI_OPTION}, - {MODULE_SUBTYPE_MULTI_XERALL, 0, false, NO_SUBTYPE, nullptr}, - {MODULE_SUBTYPE_MULTI_MT99XX2, 0, false, STR_SUBTYPE_MT992, nullptr}, - {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) - { 0xfe, 0, false, NO_SUBTYPE, nullptr} -}; int Multiprotocols::MultiProtocolDefinition::getOptionMin() const { if (optionsstr == STR_MULTI_RFPOWER) @@ -212,17 +59,7 @@ const Multiprotocols::MultiProtocolDefinition & Multiprotocols::getProtocol(int // static QString Multiprotocols::protocolToString(int protocol, bool custom) { - static const QStringList strings({ - "FlySky", "Hubsan", "FrSky", "Hisky", "V2x2", "DSM", "Devo", "YD717", "KN", "SymaX", "SLT", "CX10", "CG023", - "Bayang", "ESky", "MT99XX", "MJXQ", "Shenqi", "FY326", "Futaba", "J6 PRO","FQ777","Assan","Hontai","Open LRS", - "FlySky AFHDS2A", "Q2x2", "WK2x01", "Q303", "GW008", "DM002", "Cabell", "ESky 150", "H8 3D", "Corona", "CFlie", - "Hitec", "Wfly", "Bugs", "Bugs Mini", "Traxxas", "NCC-1701-A", "E01X", "WL Heli V911S", "GD00X", "Volantex V761", - "KFPlan KF606", "Redpine", "Potensic", "ZSX", "Height", "Scanner", "FrSky RX", "FlySky AFHDS2A RX", "HoTT", "Fx816", - "Bayang RX", "Pelikan", "Tiger", "XK", "XN297 Dump", "FrSky X 2.1", "FrSky R9", "Propel", "FrSky L", "Skyartec", - "ESky 150v2", "DSM RX", "JJRC345", "Q90C", "Kyosho", "RadioLink", "ExpressLRS", "Realacc", "OMP", "M-Link", "Wfly 2", - "Eachine E016H v2", "E010 R5", "Loli 3", "Eachine E129", "Joysway", "Eachine E016H", "Config", "IKEA Ansluta", "WilliFM", - "LOSI", "Mould King", "Xerall", "MT99XX2" - }); + static const QStringList strings { PROTO_NAMES }; return strings.value(protocol, CPN_STR_UNKNOWN_ITEM); } diff --git a/companion/src/firmwares/multiprotocols.h b/companion/src/firmwares/multiprotocols.h index 42a6cfc9cf8..ecd10aca55e 100644 --- a/companion/src/firmwares/multiprotocols.h +++ b/companion/src/firmwares/multiprotocols.h @@ -37,6 +37,7 @@ class Multiprotocols int protocol; unsigned int maxSubtype; bool hasFailsafe; + bool disableChannelMap; QStringList protocols; QString optionsstr; }; @@ -44,6 +45,7 @@ class Multiprotocols struct MultiProtocolDefinition { const int protocol; const bool hasFailsafe; + const bool disableChannelMap; const QStringList subTypeStrings; const QString optionsstr; @@ -59,6 +61,7 @@ class Multiprotocols MultiProtocolDefinition(const radio_mm_definition &rd) : protocol(rd.protocol), hasFailsafe(rd.hasFailsafe), + disableChannelMap(rd.disableChannelMap), subTypeStrings(rd.protocols), optionsstr(rd.optionsstr) { diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp index 27fdaf1554e..b54cc51bd44 100644 --- a/companion/src/modeledit/setup.cpp +++ b/companion/src/modeledit/setup.cpp @@ -221,6 +221,7 @@ void TimerPanel::onModeChanged(int index) #define MASK_GHOST (1<<17) #define MASK_BAUDRATE (1<<18) #define MASK_MULTI_DSM_OPT (1<<19) +#define MASK_CHANNELMAP (1<<20) quint8 ModulePanel::failsafesValueDisplayType = ModulePanel::FAILSAFE_DISPLAY_PERCENT; @@ -286,9 +287,6 @@ ModulePanel::ModulePanel(QWidget * parent, ModelData & model, ModuleData & modul continue; ui->multiProtocol->addItem(Multiprotocols::protocolToString(i), i); } - for (int i = MODULE_SUBTYPE_MULTI_LAST + 1; i <= 124; i++) { - ui->multiProtocol->addItem(QString::number(i + 3), i); - } ui->btnGrpValueType->setId(ui->optPercent, FAILSAFE_DISPLAY_PERCENT); ui->btnGrpValueType->setId(ui->optUs, FAILSAFE_DISPLAY_USEC); @@ -501,6 +499,8 @@ void ModulePanel::update() } if (pdef.hasFailsafe || (module.multi.rfProtocol == MODULE_SUBTYPE_MULTI_FRSKY && (module.subType == 0 || module.subType == 2 || module.subType > 3 ))) mask |= MASK_FAILSAFES; + if (pdef.disableChannelMap) + mask |= MASK_CHANNELMAP; break; case PULSES_AFHDS3: module.channelsCount = 18; @@ -522,8 +522,7 @@ void ModulePanel::update() else if (model->trainerMode != TRAINER_MODE_MASTER_JACK) { mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT; } - - if (module.hasFailsafes(firmware)) { + else if (module.hasFailsafes(firmware)) { mask |= MASK_FAILSAFES; } @@ -639,7 +638,7 @@ void ModulePanel::update() ui->lblCboOption->setVisible(mask & MASK_MULTI_DSM_OPT); ui->cboOption->setVisible(mask & MASK_MULTI_DSM_OPT); ui->disableTelem->setVisible(mask & MASK_MULTIMODULE); - ui->disableChMap->setVisible(mask & MASK_MULTIMODULE); + ui->disableChMap->setVisible(mask & MASK_CHANNELMAP); ui->lowPower->setVisible(mask & MASK_MULTIMODULE); ui->autoBind->setVisible(mask & MASK_MULTIMODULE); if (module.multi.rfProtocol == MODULE_SUBTYPE_MULTI_DSM2) diff --git a/radio/src/MultiProtoDefs.h b/radio/src/MultiProtoDefs.h new file mode 100644 index 00000000000..abea9e1d336 --- /dev/null +++ b/radio/src/MultiProtoDefs.h @@ -0,0 +1,138 @@ +/* + * Copyright (C) EdgeTX + * + * Based on code named + * opentx - https://github.com/opentx/opentx + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#pragma once + +// +// Common list of supported Multi protocols (currently reflecting Multi firmware version 1.3.3.20) +// +enum ModuleSubtypeMulti { + MODULE_SUBTYPE_MULTI_FIRST = 0, + MODULE_SUBTYPE_MULTI_FLYSKY = MODULE_SUBTYPE_MULTI_FIRST, + MODULE_SUBTYPE_MULTI_HUBSAN, //1 + MODULE_SUBTYPE_MULTI_FRSKY, //2 + MODULE_SUBTYPE_MULTI_HISKY, //3 + MODULE_SUBTYPE_MULTI_V2X2, //4 + MODULE_SUBTYPE_MULTI_DSM2, //5 + MODULE_SUBTYPE_MULTI_DEVO, + MODULE_SUBTYPE_MULTI_YD717, + MODULE_SUBTYPE_MULTI_KN, + MODULE_SUBTYPE_MULTI_SYMAX, + MODULE_SUBTYPE_MULTI_SLT, //10 + MODULE_SUBTYPE_MULTI_CX10, + MODULE_SUBTYPE_MULTI_CG023, + MODULE_SUBTYPE_MULTI_BAYANG, + MODULE_SUBTYPE_MULTI_FRSKYX, + MODULE_SUBTYPE_MULTI_ESky, //15 + MODULE_SUBTYPE_MULTI_MT99XX, + MODULE_SUBTYPE_MULTI_MJXQ, + MODULE_SUBTYPE_MULTI_SHENQI, + MODULE_SUBTYPE_MULTI_FY326, + MODULE_SUBTYPE_MULTI_FUTABA, //20 + MODULE_SUBTYPE_MULTI_J6PRO, + MODULE_SUBTYPE_MULTI_FQ777, + MODULE_SUBTYPE_MULTI_ASSAN, + MODULE_SUBTYPE_MULTI_FRSKYV, + MODULE_SUBTYPE_MULTI_HONTAI, //25 + MODULE_SUBTYPE_MULTI_OLRS, + MODULE_SUBTYPE_MULTI_FS_AFHDS2A, + MODULE_SUBTYPE_MULTI_Q2X2, + MODULE_SUBTYPE_MULTI_WK_2X01, + MODULE_SUBTYPE_MULTI_Q303, //30 + MODULE_SUBTYPE_MULTI_GW008, + MODULE_SUBTYPE_MULTI_DM002, + MODULE_SUBTYPE_MULTI_CABELL, + MODULE_SUBTYPE_MULTI_ESKY150, + MODULE_SUBTYPE_MULTI_H83D, //35 + MODULE_SUBTYPE_MULTI_CORONA, + MODULE_SUBTYPE_MULTI_CFLIE, + MODULE_SUBTYPE_MULTI_HITEC, + MODULE_SUBTYPE_MULTI_WFLY, + MODULE_SUBTYPE_MULTI_BUGS, //40 + MODULE_SUBTYPE_MULTI_BUGS_MINI, + MODULE_SUBTYPE_MULTI_TRAXXAS, + MODULE_SUBTYPE_MULTI_NCC1701, + MODULE_SUBTYPE_MULTI_E01X, + MODULE_SUBTYPE_MULTI_V911S, //45 + MODULE_SUBTYPE_MULTI_GD00X, + MODULE_SUBTYPE_MULTI_V761, + MODULE_SUBTYPE_MULTI_KF606, + MODULE_SUBTYPE_MULTI_REDPINE, + MODULE_SUBTYPE_MULTI_POTENSIC, //50 + MODULE_SUBTYPE_MULTI_ZSX, + MODULE_SUBTYPE_MULTI_HEIGHT, + MODULE_SUBTYPE_MULTI_SCANNER, + MODULE_SUBTYPE_MULTI_FRSKYX_RX, + MODULE_SUBTYPE_MULTI_AFHDS2A_RX, //55 + MODULE_SUBTYPE_MULTI_HOTT, + MODULE_SUBTYPE_MULTI_FX816, + MODULE_SUBTYPE_MULTI_BAYANG_RX, + MODULE_SUBTYPE_MULTI_PELIKAN, + MODULE_SUBTYPE_MULTI_TIGER, //60 + MODULE_SUBTYPE_MULTI_XK, + MODULE_SUBTYPE_MULTI_XN297DUMP, + MODULE_SUBTYPE_MULTI_FRSKYX2, + MODULE_SUBTYPE_MULTI_FRSKY_R9, + MODULE_SUBTYPE_MULTI_PROPEL, //65 + MODULE_SUBTYPE_MULTI_FRSKYL, + MODULE_SUBTYPE_MULTI_SKYARTEC, + MODULE_SUBTYPE_MULTI_ESKY150V2, + MODULE_SUBTYPE_MULTI_DSM_RX, + MODULE_SUBTYPE_MULTI_JJRC345, //70 + MODULE_SUBTYPE_MULTI_Q90C, + MODULE_SUBTYPE_MULTI_KYOSHO, + MODULE_SUBTYPE_MULTI_RLINK, + MODULE_SUBTYPE_MULTI_ELRS, + MODULE_SUBTYPE_MULTI_REALACC, //75 + MODULE_SUBTYPE_MULTI_OMP, + MODULE_SUBTYPE_MULTI_MLINK, + MODULE_SUBTYPE_MULTI_WFLY2, + MODULE_SUBTYPE_MULTI_E016HV2, + MODULE_SUBTYPE_MULTI_E010R5, //80 + MODULE_SUBTYPE_MULTI_LOLI, + MODULE_SUBTYPE_MULTI_E129, + MODULE_SUBTYPE_MULTI_JOYSWAY, + MODULE_SUBTYPE_MULTI_E016H, + MODULE_SUBTYPE_MULTI_CONFIG, //85 + MODULE_SUBTYPE_MULTI_IKEAANSLUTA, + MODULE_SUBTYPE_MULTI_WILLIFM, + MODULE_SUBTYPE_MULTI_LOSI, + MODULE_SUBTYPE_MULTI_MOULDKG, + MODULE_SUBTYPE_MULTI_XERALL, //90 + MODULE_SUBTYPE_MULTI_MT99XX2, + MODULE_SUBTYPE_MULTI_KYOSHO2, + MODULE_SUBTYPE_MULTI_LAST = MODULE_SUBTYPE_MULTI_KYOSHO2 +}; + +// +// Common list of Multi protocol names +// +#define PROTO_NAMES \ + "FlySky","Hubsan","FrSkyD","Hisky","V2x2","DSM","Devo","YD717","KN","SymaX",\ + "SLT","CX10","CG023","Bayang","FrSkyX","ESky","MT99XX","MJXq","Shenqi","FY326",\ + "Futaba","J6 Pro","FQ777","Assan","FrSkyV","Hontai","OpenLrs","FlSky2A","Q2x2","Walkera", \ + "Q303","GW008","DM002","Cabell","Esky150","H8 3D","Corona","CFlie","Hitec","WFly",\ + "Bugs","BugMini","Traxxas","NCC1701","E01X","V911S","GD00X","V761","KF606","Redpine",\ + "Potensi","ZSX","Height","Scanner","FrSkyRX","FS2A_RX","HoTT","FX816","BayanRX","Pelikan",\ + "Tiger", "XK","XN297DU","FrSkyX2","FrSkyR9","Propel","FrSkyL","Skyartc","ESky-v2","DSM RX",\ + "JJRC345","Q90C","Kyosho","RadLink","ExpLRS","Realacc","OMP","M-Link","Wfly 2","E016Hv2",\ + "E010r5","LOLI","E129","JOYSWAY","E016H","Config","IKEA","WILLIFM","Losi","MouldKg",\ + "Xerall","MT99XX2", "Kyosho2" diff --git a/radio/src/MultiSubtypeDefs.h b/radio/src/MultiSubtypeDefs.h new file mode 100644 index 00000000000..265193f3c1b --- /dev/null +++ b/radio/src/MultiSubtypeDefs.h @@ -0,0 +1,250 @@ +/* + * Copyright (C) EdgeTX + * + * Based on code named + * opentx - https://github.com/opentx/opentx + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#pragma once + +// +// Single source of Multi protocol defintions: +// - MultiProtoDefs.h contains the protocol list and names as per Multi.txt +// Widely used in Companion/Simulator and radio firmware code +// - MutliSubtypesDef.h contains subtype definitions and generates data structurse +// for Companion and Simulator/radio code in radio/src/gui/gui_common.cpp and +// companion/src/firmwares/multiprotocols.cpp +// + +// +// include list of Multi protocosl +// +#include "MultiProtoDefs.h" + +// +// This distinction circumvents the different ways of handling translations of menu texts +// and sets the defines STRLIST and PROTODEF such that the correct Companion/Simulator and radio code +// data structures are generated +// +#if defined(CPN) + #define STRLIST(x, ...) static const QStringList x __VA_ARGS__; + #define PROTODEF const Multiprotocols multiProtocols + + #define STR_MULTI_OPTION QT_TRANSLATE_NOOP("Multiprotocols", "Option value") + #define STR_MULTI_RFTUNE QT_TRANSLATE_NOOP("Multiprotocols", "CC2500 frequency fine tune") + #define STR_MULTI_VIDFREQ QT_TRANSLATE_NOOP("Multiprotocols", "Video TX frequency") + #define STR_MULTI_FIXEDID QT_TRANSLATE_NOOP("Multiprotocols", "Fixed ID value") + #define STR_MULTI_TELEMETRY QT_TRANSLATE_NOOP("Multiprotocols", "Telemetry") + #define STR_MULTI_SERVOFREQ QT_TRANSLATE_NOOP("Multiprotocols", "Servo output frequency") + #define STR_MULTI_MAX_THROW QT_TRANSLATE_NOOP("Multiprotocols", "Enable Max Throw") + #define STR_MULTI_RFCHAN QT_TRANSLATE_NOOP("Multiprotocols", "RF Channel Number") + #define STR_MULTI_RFPOWER QT_TRANSLATE_NOOP("Multiprotocols", "RF power") + + #define STR_MULTI_DEFAULT QT_TRANSLATE_NOOP("Multiprotocols", "DEFAULT") + STRLIST(NO_SUBTYPE, {STR_MULTI_DEFAULT}) +#else + #define STRLIST(x, ...) const char* const x[] = __VA_ARGS__; + #define PROTODEF const mm_protocol_definition multi_protocols[] + + const char* const mm_options_strings::options[] = { + nullptr, + STR_MULTI_OPTION, + STR_MULTI_RFTUNE, + STR_MULTI_VIDFREQ, + STR_MULTI_FIXEDID, + STR_MULTI_TELEMETRY, + STR_MULTI_SERVOFREQ, + STR_MULTI_MAX_THROW, + STR_MULTI_RFCHAN, + STR_MULTI_RFPOWER, + STR_MULTI_WBUS // probably not used by MPM anymore +}; + + #define NO_SUBTYPE nullptr +#endif + +// +// Common definitions of Multi protocol subtype options (only for protocols that do have subtypes) +// +STRLIST(STR_SUBTYPE_FLYSKY, {"Std","V9x9","V6x6","V912","CX20"}) +STRLIST(STR_SUBTYPE_HUBSAN, {"H107","H301","H501"}) +STRLIST(STR_SUBTYPE_FRSKYD, {"D8","Cloned"}) +STRLIST(STR_SUBTYPE_FRSKYX, {"D16","D16 8ch","LBT(EU)","LBT 8ch","Cloned", "Cloned 8ch"}) +STRLIST(STR_SUBTYPE_HISKY, {"Std","HK310"}) +STRLIST(STR_SUBTYPE_V2X2, {"Std","JXD506","MR101"}) +STRLIST(STR_SUBTYPE_DSM, {"2 1F","2 2F","X 1F","X 2F","Auto","R 1F"}) +STRLIST(STR_SUBTYPE_DEVO, {"8ch","10ch","12ch","6ch","7ch"}) +STRLIST(STR_SUBTYPE_YD717, {"Std","SkyWlkr","Syma X4","XINXUN","NIHUI"}) +STRLIST(STR_SUBTYPE_KN, {"WLtoys","FeiLun"}) +STRLIST(STR_SUBTYPE_SYMAX, {"Std","X5C"}) +STRLIST(STR_SUBTYPE_SLT, {"V1_6ch","V2_8ch","Q100","Q200","MR100"}) +STRLIST(STR_SUBTYPE_CX10, {"Green","Blue","DM007","-","JC3015a","JC3015b","MK33041"}) +STRLIST(STR_SUBTYPE_CG023, {"Std","YD829"}) +STRLIST(STR_SUBTYPE_BAYANG, {"Std","H8S3D","X16 AH","IRDrone","DHD D4","QX100"}) +STRLIST(STR_SUBTYPE_ESky, {"Std","ET4"}) +STRLIST(STR_SUBTYPE_MT99, {"MT99","H7","YZ","LS","FY805","A180","Dragon","F949G"}) +STRLIST(STR_SUBTYPE_MJXQ, {"WLH08","X600","X800","H26D","E010","H26WH","Phoenix"}) +STRLIST(STR_SUBTYPE_FY326, {"Std","FY319"}) +STRLIST(STR_SUBTYPE_FUTABA, {"SFHSS"}) +STRLIST(STR_SUBTYPE_HONTAI, {"Std","JJRC X1","X5C1","FQ_951"}) +STRLIST(STR_SUBTYPE_AFHDS2A, {"PWM,IBUS","PPM,IBUS","PWM,SBUS","PPM,SBUS","PWM,IB16","PPM,IB16"}) +STRLIST(STR_SUBTYPE_Q2X2, {"Q222","Q242","Q282"}) +STRLIST(STR_SUBTYPE_WK2x01, {"WK2801","WK2401","W6_5_1","W6_6_1","W6_HeL","W6_HeI"}) +STRLIST(STR_SUBTYPE_Q303, {"Std","CX35","CX10D","CX10WD"}) +STRLIST(STR_SUBTYPE_CABELL, {"V3","V3 Telm","-","-","-","-","F-Safe","Unbind"}) +STRLIST(STR_SUBTYPE_ESKY150, {"4ch","7ch"}) +STRLIST(STR_SUBTYPE_H83D, {"Std","H20H","H20Mini","H30Mini"}) +STRLIST(STR_SUBTYPE_CORONA, {"V1","V2","FD V3"}) +STRLIST(STR_SUBTYPE_HITEC, {"Optima","Opt Hub","Minima"}) +STRLIST(STR_SUBTYPE_WFLY, {"WFR0x"}) +STRLIST(STR_SUBTYPE_BUGS_MINI, {"Std","Bugs3H"}) +STRLIST(STR_SUBTYPE_TRAXXAS, {"6519"}) +STRLIST(STR_SUBTYPE_E01X, {"E012","E015"}) +STRLIST(STR_SUBTYPE_V911S, {"Std","E119"}) +STRLIST(STR_SUBTYPE_GD00X, {"GD_V1","GD_V2"}) +STRLIST(STR_SUBTYPE_V761, {"3ch","4ch"}) +STRLIST(STR_SUBTYPE_KF606, {"KF606","MIG320"}) +STRLIST(STR_SUBTYPE_REDPINE, {"Fast","Slow"}) +STRLIST(STR_SUBTYPE_POTENSIC, {"A20"}) +STRLIST(STR_SUBTYPE_ZSX, {"280JJRC"}) +STRLIST(STR_SUBTYPE_HEIGHT, {"5ch","8ch"}) +STRLIST(STR_SUBTYPE_FRSKYX_RX, {"Multi","CloneTX","EraseTX","CPPM"}) +STRLIST(STR_SUBTYPE_HOTT, {"Sync","No_Sync"}) +STRLIST(STR_SUBTYPE_FX816, {"P38"}) +STRLIST(STR_SUBTYPE_PELIKAN, {"Pro","Lite","SCX24"}) +STRLIST(STR_SUBTYPE_XK, {"X450","X420"}) +STRLIST(STR_SUBTYPE_XN297DUMP, {"250K","1M","2M","AUTO","NRF","CC2500"}) +STRLIST(STR_SUBTYPE_FRSKYR9, {"915MHz","868MHz","915 8ch","868 8ch","FCC","---","FCC 8ch"}) +STRLIST(STR_SUBTYPE_PROPEL, {"74-Z"}) +STRLIST(STR_SUBTYPE_FRSKYL, {"LR12","LR12 6ch"}) +STRLIST(STR_SUBTYPE_ESKY150V2, {"150 V2"}) +STRLIST(STR_SUBTYPE_JJRC345, {"Std","SkyTmbr"}) +STRLIST(STR_SUBTYPE_KYOSHO, {"FHSS","Hype"}) +STRLIST(STR_SUBTYPE_KYOSHO2, {"KT-17"}) +STRLIST(STR_SUBTYPE_RLINK, {"Surface","Air","DumboRC"}) +STRLIST(STR_SUBTYPE_ELRS, {"N/A WIP"}) +STRLIST(STR_SUBTYPE_REALACC, {"R11"}) +STRLIST(STR_SUBTYPE_WFLY2, {"RF20x"}) +STRLIST(STR_SUBTYPE_MOULDKG, {"Analog","Digital"}) +STRLIST(STR_SUBTYPE_MT992, {"PA18"}) +STRLIST(STR_SUBTYPE_RX, {"Multi","CPPM"}) +STRLIST(STR_SUBTYPE_E129, {"STD","C186"}) + +// +// Common data structure defining Multi protocol capabilites, i.e. number of subtypes, +// failsafe support yes/no, channel map disabled yes/no, reference to the suptype options strings above +// and further protocol options, e.g. RF tune, video frequency. +// +PROTODEF { + {MODULE_SUBTYPE_MULTI_FLYSKY, 4, false, true, STR_SUBTYPE_FLYSKY, nullptr}, + {MODULE_SUBTYPE_MULTI_HUBSAN, 2, false, false, STR_SUBTYPE_HUBSAN, STR_MULTI_VIDFREQ}, + {MODULE_SUBTYPE_MULTI_FRSKY, 1, false, false, STR_SUBTYPE_FRSKYD, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_HISKY, 1, true, true, STR_SUBTYPE_HISKY, nullptr}, + {MODULE_SUBTYPE_MULTI_V2X2, 2, false, false, STR_SUBTYPE_V2X2, nullptr}, + {MODULE_SUBTYPE_MULTI_DSM2, 5, false, true, STR_SUBTYPE_DSM, STR_MULTI_MAX_THROW}, + {MODULE_SUBTYPE_MULTI_DEVO, 4, true, true, STR_SUBTYPE_DEVO, STR_MULTI_FIXEDID}, + {MODULE_SUBTYPE_MULTI_YD717, 4, false, false, STR_SUBTYPE_YD717, nullptr}, + {MODULE_SUBTYPE_MULTI_KN, 1, false, false, STR_SUBTYPE_KN, nullptr}, + {MODULE_SUBTYPE_MULTI_SYMAX, 1, false, false, STR_SUBTYPE_SYMAX, nullptr}, + {MODULE_SUBTYPE_MULTI_SLT, 4, false, true, STR_SUBTYPE_SLT, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_CX10, 6, false, false, STR_SUBTYPE_CX10, nullptr}, + {MODULE_SUBTYPE_MULTI_CG023, 1, false, false, STR_SUBTYPE_CG023, nullptr}, + {MODULE_SUBTYPE_MULTI_BAYANG, 5, false, false, STR_SUBTYPE_BAYANG, STR_MULTI_TELEMETRY}, + {MODULE_SUBTYPE_MULTI_FRSKYX, 5, true, false, STR_SUBTYPE_FRSKYX, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_ESky, 1, false, true, STR_SUBTYPE_ESky, nullptr}, + {MODULE_SUBTYPE_MULTI_MT99XX, 7, false, false, STR_SUBTYPE_MT99, nullptr}, + {MODULE_SUBTYPE_MULTI_MJXQ, 6, false, false, STR_SUBTYPE_MJXQ, nullptr}, + {MODULE_SUBTYPE_MULTI_SHENQI, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_FY326, 1, false, false, STR_SUBTYPE_FY326, nullptr}, + {MODULE_SUBTYPE_MULTI_FUTABA, 0, true, true, STR_SUBTYPE_FUTABA, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_J6PRO, 0, false, true, NO_SUBTYPE, nullptr}, + {MODULE_SUBTYPE_MULTI_FQ777, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_ASSAN, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_FRSKYV, 0, false, false, NO_SUBTYPE, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_HONTAI, 3, false, false, STR_SUBTYPE_HONTAI, nullptr}, + {MODULE_SUBTYPE_MULTI_OLRS, 0, false, false, NO_SUBTYPE, STR_MULTI_RFPOWER}, + {MODULE_SUBTYPE_MULTI_FS_AFHDS2A, 5, true, true, STR_SUBTYPE_AFHDS2A, STR_MULTI_SERVOFREQ}, + {MODULE_SUBTYPE_MULTI_Q2X2, 2, false, false, STR_SUBTYPE_Q2X2, nullptr}, + {MODULE_SUBTYPE_MULTI_WK_2X01, 5, true, true, STR_SUBTYPE_WK2x01, nullptr}, + {MODULE_SUBTYPE_MULTI_Q303, 3, false, false, STR_SUBTYPE_Q303, nullptr}, + {MODULE_SUBTYPE_MULTI_GW008, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_DM002, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_CABELL, 7, false, false, STR_SUBTYPE_CABELL, STR_MULTI_OPTION}, + {MODULE_SUBTYPE_MULTI_ESKY150, 1, false, false, STR_SUBTYPE_ESKY150, nullptr}, + {MODULE_SUBTYPE_MULTI_H83D, 3, false, false, STR_SUBTYPE_H83D, nullptr}, + {MODULE_SUBTYPE_MULTI_CORONA, 2, false, false, STR_SUBTYPE_CORONA, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_CFLIE, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_HITEC, 2, false, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_WFLY, 0, true, false, STR_SUBTYPE_WFLY, nullptr}, + {MODULE_SUBTYPE_MULTI_BUGS, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_BUGS_MINI, 1, false, false, STR_SUBTYPE_BUGS_MINI, nullptr}, + {MODULE_SUBTYPE_MULTI_TRAXXAS, 0, false, false, STR_SUBTYPE_TRAXXAS, nullptr}, + {MODULE_SUBTYPE_MULTI_NCC1701, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_E01X, 1, false, false, STR_SUBTYPE_E01X, nullptr}, + {MODULE_SUBTYPE_MULTI_V911S, 1, false, false, STR_SUBTYPE_V911S, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_GD00X, 1, false, false, STR_SUBTYPE_GD00X, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_V761, 1, false, false, STR_SUBTYPE_V761, nullptr}, + {MODULE_SUBTYPE_MULTI_KF606, 1, false, false, STR_SUBTYPE_KF606, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_REDPINE, 1, false, false, STR_SUBTYPE_REDPINE, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_POTENSIC, 0, false, false, STR_SUBTYPE_POTENSIC, nullptr}, + {MODULE_SUBTYPE_MULTI_ZSX, 0, false, false, STR_SUBTYPE_ZSX, nullptr}, + {MODULE_SUBTYPE_MULTI_HEIGHT, 1, false, false, STR_SUBTYPE_HEIGHT, nullptr}, + // MODULE_SUBTYPE_MULTI_SCANNER non selectable and masked out for selection + {MODULE_SUBTYPE_MULTI_FRSKYX_RX, 3, false, false, STR_SUBTYPE_FRSKYX_RX, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_AFHDS2A_RX, 1, false, false, STR_SUBTYPE_RX, nullptr}, //new + {MODULE_SUBTYPE_MULTI_HOTT, 1, true, false, STR_SUBTYPE_HOTT, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_FX816, 0, false, false, STR_SUBTYPE_FX816, nullptr}, + {MODULE_SUBTYPE_MULTI_BAYANG_RX, 1, false, false, STR_SUBTYPE_RX, nullptr}, //new + {MODULE_SUBTYPE_MULTI_PELIKAN, 2, false, true, STR_SUBTYPE_PELIKAN, nullptr}, + {MODULE_SUBTYPE_MULTI_TIGER, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_XK, 1, false, false, STR_SUBTYPE_XK, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_XN297DUMP, 5, false, false, STR_SUBTYPE_XN297DUMP, STR_MULTI_RFCHAN}, + {MODULE_SUBTYPE_MULTI_FRSKYX2, 5, true, false, STR_SUBTYPE_FRSKYX, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_FRSKY_R9, 6, true, false, STR_SUBTYPE_FRSKYR9, nullptr}, + {MODULE_SUBTYPE_MULTI_PROPEL, 0, false, false, STR_SUBTYPE_PROPEL, nullptr}, + {MODULE_SUBTYPE_MULTI_FRSKYL, 1, false, false, STR_SUBTYPE_FRSKYL, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_SKYARTEC, 0, false, true, NO_SUBTYPE, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_ESKY150V2, 0, false, true, STR_SUBTYPE_ESKY150V2, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_DSM_RX, 1, false, false, STR_SUBTYPE_RX, nullptr}, //new + {MODULE_SUBTYPE_MULTI_JJRC345, 1, false, false, STR_SUBTYPE_JJRC345, nullptr}, + {MODULE_SUBTYPE_MULTI_Q90C, 0, false, false, NO_SUBTYPE, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_KYOSHO, 1, false, true, STR_SUBTYPE_KYOSHO, nullptr}, + {MODULE_SUBTYPE_MULTI_RLINK, 2, false, false, STR_SUBTYPE_RLINK, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_ELRS, 0, false, false, STR_SUBTYPE_ELRS, nullptr}, + {MODULE_SUBTYPE_MULTI_REALACC, 0, false, false, STR_SUBTYPE_REALACC, nullptr}, + {MODULE_SUBTYPE_MULTI_OMP, 0, false, false, NO_SUBTYPE, nullptr}, + {MODULE_SUBTYPE_MULTI_MLINK, 0, true, false, NO_SUBTYPE, nullptr}, + {MODULE_SUBTYPE_MULTI_WFLY2, 0, true, false, STR_SUBTYPE_WFLY2, STR_MULTI_OPTION}, + {MODULE_SUBTYPE_MULTI_E016HV2, 0, false, false, NO_SUBTYPE, STR_MULTI_RFTUNE}, + {MODULE_SUBTYPE_MULTI_E010R5, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_LOLI, 0, true, false, NO_SUBTYPE, nullptr}, + {MODULE_SUBTYPE_MULTI_E129, 1, false, false, STR_SUBTYPE_E129, nullptr}, //new + {MODULE_SUBTYPE_MULTI_JOYSWAY, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_E016H, 0, false, false, NO_SUBTYPE, nullptr}, //new + // MODULE_SUBTYPE_MULTI_SCANNER non selectable and masked out for selection + {MODULE_SUBTYPE_MULTI_IKEAANSLUTA,0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_WILLIFM, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_LOSI, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_MOULDKG, 1, false, false, STR_SUBTYPE_MOULDKG, STR_MULTI_OPTION}, + {MODULE_SUBTYPE_MULTI_XERALL, 0, false, false, NO_SUBTYPE, nullptr}, //new + {MODULE_SUBTYPE_MULTI_MT99XX2, 0, false, false, STR_SUBTYPE_MT992, nullptr}, + {MODULE_SUBTYPE_MULTI_KYOSHO2, 0, false, false, STR_SUBTYPE_KYOSHO2, nullptr}, + {MM_RF_CUSTOM_SELECTED, 0, true, false, NO_SUBTYPE, STR_MULTI_OPTION}, + + // Sentinel and default for protocols not listed above (MM_RF_CUSTOM is 0xff) + {0xfe, 0, false, false, NO_SUBTYPE, nullptr}, +}; diff --git a/radio/src/gui/colorlcd/module_setup.cpp b/radio/src/gui/colorlcd/module_setup.cpp index 49406645bdf..b8b88fa23d9 100644 --- a/radio/src/gui/colorlcd/module_setup.cpp +++ b/radio/src/gui/colorlcd/module_setup.cpp @@ -673,6 +673,8 @@ void ModuleSubTypeChoice::update() uint32_t startUpdate = RTOS_GET_MS(); while (!status.isValid() && (RTOS_GET_MS() - startUpdate < 250)); + + SET_DIRTY(); }); } #endif diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index 1bf188d94c6..78461a0ad81 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -21,6 +21,9 @@ #include "opentx.h" +#undef CPN +#include "MultiSubtypeDefs.h" + #if defined(PCBFRSKY) || defined(PCBFLYSKY) uint8_t switchToMix(uint8_t source) { @@ -442,7 +445,7 @@ bool isSerialModeAvailable(uint8_t port_nr, int mode) (mode == UART_MODE_TELEMETRY || mode == UART_MODE_SBUS_TRAINER)) return false; #endif - + auto p = hasSerialMode(mode); if (p >= 0 && p != port_nr) return false; return true; @@ -1074,179 +1077,11 @@ int getFirstAvailable(int min, int max, IsValueAvailable isValueAvailable) } #if defined(MULTIMODULE) -// Third row is number of subtypes -1 (max valid subtype) -#define NO_SUBTYPE nullptr - -// Table is designed to be shared with companion multi.cpp - -// The subtype and options strings are only referenced here, so -// define them here to avoid duplication in all language files -// Also since these strings are ARM only and likely stay ARM only -// we don't need the special eeprom/flash string handling, just define them as -// local strings - -const char* const STR_SUBTYPE_FLYSKY[] = {"Std","V9x9","V6x6","V912","CX20"}; -const char* const STR_SUBTYPE_HUBSAN[] = {"H107","H301","H501"}; -const char* const STR_SUBTYPE_FRSKYD[] = {"D8","Cloned"}; -const char* const STR_SUBTYPE_FRSKYX[] = {"D16","D16 8ch","LBT(EU)","LBT 8ch","Cloned", "Cloned 8ch"}; -const char* const STR_SUBTYPE_HISKY[] = {"Std","HK310"}; -const char* const STR_SUBTYPE_V2X2[] = {"Std","JXD506","MR101"}; -const char* const STR_SUBTYPE_DSM[] = {"2 1F","2 2F","X 1F","X 2F","Auto","R 1F"}; -const char* const STR_SUBTYPE_DEVO[] = {"8ch","10ch","12ch","6ch","7ch"}; -const char* const STR_SUBTYPE_YD717[] = {"Std","SkyWlkr","Syma X4","XINXUN","NIHUI"}; -const char* const STR_SUBTYPE_KN[] = {"WLtoys","FeiLun"}; -const char* const STR_SUBTYPE_SYMAX[] = {"Std","X5C"}; -const char* const STR_SUBTYPE_SLT[] = {"V1_6ch","V2_8ch","Q100","Q200","MR100"}; -const char* const STR_SUBTYPE_CX10[] = {"Green","Blue","DM007","-","JC3015a","JC3015b","MK33041"}; -const char* const STR_SUBTYPE_CG023[] = {"Std","YD829"}; -const char* const STR_SUBTYPE_BAYANG[] = {"Std","H8S3D","X16 AH","IRDrone","DHD D4","QX100"}; -const char* const STR_SUBTYPE_ESky[] = {"Std","ET4"}; -const char* const STR_SUBTYPE_MT99[] = {"MT99","H7","YZ","LS","FY805","A180","Dragon","F949G"}; -const char* const STR_SUBTYPE_MJXQ[] = {"WLH08","X600","X800","H26D","E010","H26WH","Phoenix"}; -const char* const STR_SUBTYPE_FY326[] = {"Std","FY319"}; -const char* const STR_SUBTYPE_FUTABA[] = {"SFHSS"}; -const char* const STR_SUBTYPE_HONTAI[] = {"Std","JJRC X1","X5C1","FQ_951"}; -const char* const STR_SUBTYPE_AFHDS2A[] = {"PWM,IBUS","PPM,IBUS","PWM,SBUS","PPM,SBUS","PWM,IB16","PPM,IB16"}; -const char* const STR_SUBTYPE_Q2X2[] = {"Q222","Q242","Q282"}; -const char* const STR_SUBTYPE_WK2x01[] = {"WK2801","WK2401","W6_5_1","W6_6_1","W6_HeL","W6_HeI"}; -const char* const STR_SUBTYPE_Q303[] = {"Std","CX35","CX10D","CX10WD"}; -const char* const STR_SUBTYPE_CABELL[] = {"V3","V3 Telm","-","-","-","-","F-Safe","Unbind"}; -const char* const STR_SUBTYPE_ESKY150[] = {"4ch","7ch"}; -const char* const STR_SUBTYPE_H83D[] = {"Std","H20H","H20Mini","H30Mini"}; -const char* const STR_SUBTYPE_CORONA[] = {"V1","V2","FD V3"}; -const char* const STR_SUBTYPE_HITEC[] = {"Optima","Opt Hub","Minima"}; -const char* const STR_SUBTYPE_WFLY[] = {"WFR0x"}; -const char* const STR_SUBTYPE_BUGS_MINI[] = {"Std","Bugs3H"}; -const char* const STR_SUBTYPE_TRAXXAS[] = {"6519"}; -const char* const STR_SUBTYPE_E01X[] = {"E012","E015"}; -const char* const STR_SUBTYPE_V911S[] = {"Std","E119"}; -const char* const STR_SUBTYPE_GD00X[] = {"GD_V1","GD_V2"}; -const char* const STR_SUBTYPE_V761[] = {"3ch","4ch"}; -const char* const STR_SUBTYPE_KF606[] = {"KF606","MIG320"}; -const char* const STR_SUBTYPE_REDPINE[] = {"Fast","Slow"}; -const char* const STR_SUBTYPE_POTENSIC[] = {"A20"}; -const char* const STR_SUBTYPE_ZSX[] = {"280JJRC"}; -const char* const STR_SUBTYPE_HEIGHT[] = {"5ch","8ch"}; -const char* const STR_SUBTYPE_FRSKYX_RX[] = {"Multi","CloneTX","EraseTX","CPPM"}; -const char* const STR_SUBTYPE_HOTT[] = {"Sync","No_Sync"}; -const char* const STR_SUBTYPE_FX816[] = {"P38"}; -const char* const STR_SUBTYPE_PELIKAN[] = {"Pro","Lite","SCX24"}; -const char* const STR_SUBTYPE_XK[] = {"X450","X420"}; -const char* const STR_SUBTYPE_XN297DUMP[] = {"250K","1M","2M","AUTO","NRF","CC2500"}; -const char* const STR_SUBTYPE_FRSKYR9[] = {"915MHz","868MHz","915 8ch","868 8ch","FCC","---","FCC 8ch"}; -const char* const STR_SUBTYPE_PROPEL[] = {"74-Z"}; -const char* const STR_SUBTYPE_FRSKYL[] = {"LR12","LR12 6ch"}; -const char* const STR_SUBTYPE_ESKY150V2[] = {"150 V2"}; -const char* const STR_SUBTYPE_JJRC345[] = {"Std","SkyTmbr"}; -const char* const STR_SUBTYPE_KYOSHO[] = {"FHSS","Hype"}; -const char* const STR_SUBTYPE_KYOSHO2[] = {"KT-17"}; -const char* const STR_SUBTYPE_RLINK[] = {"Surface","Air","DumboRC"}; -const char* const STR_SUBTYPE_ELRS[] = {"N/A WIP"}; -const char* const STR_SUBTYPE_REALACC[] = {"R11"}; -const char* const STR_SUBTYPE_WFLY2[] = {"RF20x"}; -const char* const STR_SUBTYPE_MOULDKG[] = {"Analog","Digital"}; -const char* const STR_SUBTYPE_MT992[] = {"PA18"}; - -const char* const mm_options_strings::options[] = { - nullptr, - STR_MULTI_OPTION, - STR_MULTI_RFTUNE, - STR_MULTI_VIDFREQ, - STR_MULTI_FIXEDID, - STR_MULTI_TELEMETRY, - STR_MULTI_SERVOFREQ, - STR_MULTI_MAX_THROW, - STR_MULTI_RFCHAN, - STR_MULTI_RFPOWER, - STR_MULTI_WBUS -}; - const uint8_t getMaxMultiOptions() { return DIM(mm_options_strings::options); } -const mm_protocol_definition multi_protocols[] = { -// Protocol as defined in pulses\modules_constants.h, number of sub_protocols - 1, Failsafe supported, Disable channel mapping supported, Subtype string, Option type - {MODULE_SUBTYPE_MULTI_FLYSKY, 4, false, true, STR_SUBTYPE_FLYSKY, nullptr}, - {MODULE_SUBTYPE_MULTI_HUBSAN, 2, false, false, STR_SUBTYPE_HUBSAN, STR_MULTI_VIDFREQ}, - {MODULE_SUBTYPE_MULTI_FRSKYD, 1, false, false, STR_SUBTYPE_FRSKYD, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_HISKY, 1, true, true, STR_SUBTYPE_HISKY, nullptr}, - {MODULE_SUBTYPE_MULTI_V2X2, 2, false, false, STR_SUBTYPE_V2X2, nullptr}, - {MODULE_SUBTYPE_MULTI_DSM2, 5, false, true, STR_SUBTYPE_DSM, STR_MULTI_MAX_THROW}, - {MODULE_SUBTYPE_MULTI_DEVO, 4, true, true, STR_SUBTYPE_DEVO, STR_MULTI_FIXEDID}, - {MODULE_SUBTYPE_MULTI_YD717, 4, false, false, STR_SUBTYPE_YD717, nullptr}, - {MODULE_SUBTYPE_MULTI_KN, 1, false, false, STR_SUBTYPE_KN, nullptr}, - {MODULE_SUBTYPE_MULTI_SYMAX, 1, false, false, STR_SUBTYPE_SYMAX, nullptr}, - {MODULE_SUBTYPE_MULTI_SLT, 4, false, true, STR_SUBTYPE_SLT, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_CX10, 6, false, false, STR_SUBTYPE_CX10, nullptr}, - {MODULE_SUBTYPE_MULTI_CG023, 1, false, false, STR_SUBTYPE_CG023, nullptr}, - {MODULE_SUBTYPE_MULTI_BAYANG, 5, false, false, STR_SUBTYPE_BAYANG, STR_MULTI_TELEMETRY}, - {MODULE_SUBTYPE_MULTI_FRSKYX, 5, true, false, STR_SUBTYPE_FRSKYX, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_ESky, 1, false, true, STR_SUBTYPE_ESky, nullptr}, - {MODULE_SUBTYPE_MULTI_MT99XX, 7, false, false, STR_SUBTYPE_MT99, nullptr}, - {MODULE_SUBTYPE_MULTI_MJXQ, 6, false, false, STR_SUBTYPE_MJXQ, nullptr}, - {MODULE_SUBTYPE_MULTI_FY326, 1, false, false, STR_SUBTYPE_FY326, nullptr}, - {MODULE_SUBTYPE_MULTI_FUTABA, 0, true, true, STR_SUBTYPE_FUTABA, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_J6PRO, 0, false, true, NO_SUBTYPE, nullptr}, - {MODULE_SUBTYPE_MULTI_FRSKYV, 0, false, false, NO_SUBTYPE, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_HONTAI, 3, false, false, STR_SUBTYPE_HONTAI, nullptr}, - {MODULE_SUBTYPE_MULTI_OLRS, 0, false, false, NO_SUBTYPE, STR_RF_POWER}, - {MODULE_SUBTYPE_MULTI_FS_AFHDS2A, 5, true, true, STR_SUBTYPE_AFHDS2A, STR_MULTI_SERVOFREQ}, - {MODULE_SUBTYPE_MULTI_Q2X2, 2, false, false, STR_SUBTYPE_Q2X2, nullptr}, - {MODULE_SUBTYPE_MULTI_WK_2X01, 5, true, true, STR_SUBTYPE_WK2x01, nullptr}, - {MODULE_SUBTYPE_MULTI_Q303, 3, false, false, STR_SUBTYPE_Q303, nullptr}, - {MODULE_SUBTYPE_MULTI_CABELL, 7, false, false, STR_SUBTYPE_CABELL, STR_MULTI_OPTION}, - {MODULE_SUBTYPE_MULTI_ESKY150, 1, false, false, STR_SUBTYPE_ESKY150, nullptr}, - {MODULE_SUBTYPE_MULTI_H83D, 3, false, false, STR_SUBTYPE_H83D, nullptr}, - {MODULE_SUBTYPE_MULTI_CORONA, 2, false, false, STR_SUBTYPE_CORONA, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_HITEC, 2, false, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_WFLY, 0, true, false, STR_SUBTYPE_WFLY, nullptr}, - {MODULE_SUBTYPE_MULTI_BUGS_MINI, 1, false, false, STR_SUBTYPE_BUGS_MINI, nullptr}, - {MODULE_SUBTYPE_MULTI_TRAXXAS, 0, false, false, STR_SUBTYPE_TRAXXAS, nullptr}, - {MODULE_SUBTYPE_MULTI_E01X, 1, false, false, STR_SUBTYPE_E01X, nullptr}, - {MODULE_SUBTYPE_MULTI_V911S, 1, false, false, STR_SUBTYPE_V911S, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_GD00X, 1, false, false, STR_SUBTYPE_GD00X, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_V761, 1, false, false, STR_SUBTYPE_V761, nullptr}, - {MODULE_SUBTYPE_MULTI_KF606, 1, false, false, STR_SUBTYPE_KF606, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_REDPINE, 1, false, false, STR_SUBTYPE_REDPINE, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_POTENSIC, 0, false, false, STR_SUBTYPE_POTENSIC, nullptr}, - {MODULE_SUBTYPE_MULTI_ZSX, 0, false, false, STR_SUBTYPE_ZSX, nullptr}, - {MODULE_SUBTYPE_MULTI_HEIGHT, 1, false, false, STR_SUBTYPE_HEIGHT, nullptr}, - {MODULE_SUBTYPE_MULTI_FRSKYX_RX, 3, false, false, STR_SUBTYPE_FRSKYX_RX, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_HOTT, 1, true, false, STR_SUBTYPE_HOTT, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_FX816, 0, false, false, STR_SUBTYPE_FX816, nullptr}, - {MODULE_SUBTYPE_MULTI_PELIKAN, 2, false, true, STR_SUBTYPE_PELIKAN, nullptr}, - {MODULE_SUBTYPE_MULTI_XK, 1, false, false, STR_SUBTYPE_XK, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_XN297DUMP, 5, false, false, STR_SUBTYPE_XN297DUMP, STR_MULTI_RFCHAN}, - {MODULE_SUBTYPE_MULTI_FRSKYX2, 5, true, false, STR_SUBTYPE_FRSKYX, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_FRSKY_R9, 7, true, false, STR_SUBTYPE_FRSKYR9, nullptr}, - {MODULE_SUBTYPE_MULTI_PROPEL, 0, false, false, STR_SUBTYPE_PROPEL, nullptr}, - {MODULE_SUBTYPE_MULTI_FRSKYL, 1, false, false, STR_SUBTYPE_FRSKYL, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_SKYARTEC, 0, false, true, NO_SUBTYPE, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_ESKY150V2, 0, false, true, STR_SUBTYPE_ESKY150V2, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_JJRC345, 1, false, false, STR_SUBTYPE_JJRC345, nullptr}, - {MODULE_SUBTYPE_MULTI_Q90C, 0, false, false, NO_SUBTYPE, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_KYOSHO, 1, false, true, STR_SUBTYPE_KYOSHO, nullptr}, - {MODULE_SUBTYPE_MULTI_RLINK, 2, false, false, STR_SUBTYPE_RLINK, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_ELRS, 0, false, false, STR_SUBTYPE_ELRS, nullptr}, - {MODULE_SUBTYPE_MULTI_REALACC, 0, false, false, STR_SUBTYPE_REALACC, nullptr}, - {MODULE_SUBTYPE_MULTI_OMP, 0, false, false, NO_SUBTYPE, nullptr}, - {MODULE_SUBTYPE_MULTI_MLINK, 0, true, false, NO_SUBTYPE, nullptr}, - {MODULE_SUBTYPE_MULTI_WFLY2, 0, true, false, STR_SUBTYPE_WFLY2, STR_MULTI_OPTION}, - {MODULE_SUBTYPE_MULTI_E016HV2, 0, false, false, NO_SUBTYPE, STR_MULTI_RFTUNE}, - {MODULE_SUBTYPE_MULTI_LOLI, 0, true, false, NO_SUBTYPE, nullptr}, - {MODULE_SUBTYPE_MULTI_MOULDKG, 1, false, false, STR_SUBTYPE_MOULDKG, STR_MULTI_OPTION}, - {MODULE_SUBTYPE_MULTI_MT99XX2, 0, false, false, STR_SUBTYPE_MT992, nullptr}, - {MODULE_SUBTYPE_MULTI_KYOSHO2, 0, false, false, STR_SUBTYPE_KYOSHO2, nullptr}, - {MM_RF_CUSTOM_SELECTED, 7, true, true, NO_SUBTYPE, STR_MULTI_OPTION}, - - // Sentinel and default for protocols not listed above (MM_RF_CUSTOM is 0xff) - {0xfe, 0, false, false, NO_SUBTYPE, nullptr} -}; - -#undef NO_SUBTYPE - const mm_protocol_definition *getMultiProtocolDefinition (uint8_t protocol) { const mm_protocol_definition *pdef; diff --git a/radio/src/pulses/modules_constants.h b/radio/src/pulses/modules_constants.h index 0d7223023c6..4597569976f 100644 --- a/radio/src/pulses/modules_constants.h +++ b/radio/src/pulses/modules_constants.h @@ -102,106 +102,6 @@ enum ModuleSubtypeR9M { MODULE_SUBTYPE_R9M_LAST=MODULE_SUBTYPE_R9M_AUPLUS }; -/* Multi module */ - -enum ModuleSubtypeMulti { - MODULE_SUBTYPE_MULTI_FIRST = 0, - MODULE_SUBTYPE_MULTI_FLYSKY = MODULE_SUBTYPE_MULTI_FIRST, - MODULE_SUBTYPE_MULTI_HUBSAN, //1 - MODULE_SUBTYPE_MULTI_FRSKYD, //2 - MODULE_SUBTYPE_MULTI_HISKY, //3 - MODULE_SUBTYPE_MULTI_V2X2, //4 - MODULE_SUBTYPE_MULTI_DSM2, //5 - MODULE_SUBTYPE_MULTI_DEVO, - MODULE_SUBTYPE_MULTI_YD717, - MODULE_SUBTYPE_MULTI_KN, - MODULE_SUBTYPE_MULTI_SYMAX, - MODULE_SUBTYPE_MULTI_SLT, //10 - MODULE_SUBTYPE_MULTI_CX10, - MODULE_SUBTYPE_MULTI_CG023, - MODULE_SUBTYPE_MULTI_BAYANG, - MODULE_SUBTYPE_MULTI_FRSKYX, - MODULE_SUBTYPE_MULTI_ESky, //15 - MODULE_SUBTYPE_MULTI_MT99XX, - MODULE_SUBTYPE_MULTI_MJXQ, - MODULE_SUBTYPE_MULTI_SHENQI, - MODULE_SUBTYPE_MULTI_FY326, - MODULE_SUBTYPE_MULTI_FUTABA, //20 - MODULE_SUBTYPE_MULTI_J6PRO, - MODULE_SUBTYPE_MULTI_FQ777, - MODULE_SUBTYPE_MULTI_ASSAN, - MODULE_SUBTYPE_MULTI_FRSKYV, - MODULE_SUBTYPE_MULTI_HONTAI, //25 - MODULE_SUBTYPE_MULTI_OLRS, - MODULE_SUBTYPE_MULTI_FS_AFHDS2A, - MODULE_SUBTYPE_MULTI_Q2X2, - MODULE_SUBTYPE_MULTI_WK_2X01, - MODULE_SUBTYPE_MULTI_Q303, //30 - MODULE_SUBTYPE_MULTI_GW008, - MODULE_SUBTYPE_MULTI_DM002, - MODULE_SUBTYPE_MULTI_CABELL, - MODULE_SUBTYPE_MULTI_ESKY150, - MODULE_SUBTYPE_MULTI_H83D, //35 - MODULE_SUBTYPE_MULTI_CORONA, - MODULE_SUBTYPE_MULTI_CFLIE, - MODULE_SUBTYPE_MULTI_HITEC, - MODULE_SUBTYPE_MULTI_WFLY, - MODULE_SUBTYPE_MULTI_BUGS, //40 - MODULE_SUBTYPE_MULTI_BUGS_MINI, - MODULE_SUBTYPE_MULTI_TRAXXAS, - MODULE_SUBTYPE_MULTI_NCC1701, - MODULE_SUBTYPE_MULTI_E01X, - MODULE_SUBTYPE_MULTI_V911S, //45 - MODULE_SUBTYPE_MULTI_GD00X, - MODULE_SUBTYPE_MULTI_V761, - MODULE_SUBTYPE_MULTI_KF606, - MODULE_SUBTYPE_MULTI_REDPINE, - MODULE_SUBTYPE_MULTI_POTENSIC, //50 - MODULE_SUBTYPE_MULTI_ZSX, - MODULE_SUBTYPE_MULTI_HEIGHT, - MODULE_SUBTYPE_MULTI_SCANNER, - MODULE_SUBTYPE_MULTI_FRSKYX_RX, - MODULE_SUBTYPE_MULTI_AFHDS2A_RX, //55 - MODULE_SUBTYPE_MULTI_HOTT, - MODULE_SUBTYPE_MULTI_FX816, - MODULE_SUBTYPE_MULTI_BAYANG_RX, - MODULE_SUBTYPE_MULTI_PELIKAN, - MODULE_SUBTYPE_MULTI_TIGER, //60 - MODULE_SUBTYPE_MULTI_XK, - MODULE_SUBTYPE_MULTI_XN297DUMP, - MODULE_SUBTYPE_MULTI_FRSKYX2, - MODULE_SUBTYPE_MULTI_FRSKY_R9, - MODULE_SUBTYPE_MULTI_PROPEL, //65 - MODULE_SUBTYPE_MULTI_FRSKYL, - MODULE_SUBTYPE_MULTI_SKYARTEC, - MODULE_SUBTYPE_MULTI_ESKY150V2, - MODULE_SUBTYPE_MULTI_DSM_RX, - MODULE_SUBTYPE_MULTI_JJRC345, //70 - MODULE_SUBTYPE_MULTI_Q90C, - MODULE_SUBTYPE_MULTI_KYOSHO, - MODULE_SUBTYPE_MULTI_RLINK, - MODULE_SUBTYPE_MULTI_ELRS, - MODULE_SUBTYPE_MULTI_REALACC, //75 - MODULE_SUBTYPE_MULTI_OMP, - MODULE_SUBTYPE_MULTI_MLINK, - MODULE_SUBTYPE_MULTI_WFLY2, - MODULE_SUBTYPE_MULTI_E016HV2, - MODULE_SUBTYPE_MULTI_E010R5, //80 - MODULE_SUBTYPE_MULTI_LOLI, - MODULE_SUBTYPE_MULTI_E129, - MODULE_SUBTYPE_MULTI_JOYSWAY, - MODULE_SUBTYPE_MULTI_E016H, - MODULE_SUBTYPE_MULTI_CONFIG, //85 - MODULE_SUBTYPE_MULTI_IKEAANSLUTA, - MODULE_SUBTYPE_MULTI_WILLIFM, - MODULE_SUBTYPE_MULTI_LOSI, - MODULE_SUBTYPE_MULTI_MOULDKG, - MODULE_SUBTYPE_MULTI_XERALL, //90 - MODULE_SUBTYPE_MULTI_MT99XX2, - MODULE_SUBTYPE_MULTI_KYOSHO2, - MODULE_SUBTYPE_MULTI_LAST = MODULE_SUBTYPE_MULTI_KYOSHO2 -}; - enum MMDSM2Subtypes { MM_RF_DSM2_SUBTYPE_DSM2_22, MM_RF_DSM2_SUBTYPE_DSM2_11, diff --git a/radio/src/pulses/modules_helpers.h b/radio/src/pulses/modules_helpers.h index 87d045a48c8..bca46f4871b 100644 --- a/radio/src/pulses/modules_helpers.h +++ b/radio/src/pulses/modules_helpers.h @@ -27,6 +27,7 @@ #include "opentx_helpers.h" #include "storage/storage.h" #include "globals.h" +#include "MultiProtoDefs.h" #if defined(MULTIMODULE) #include "telemetry/multi.h" diff --git a/radio/src/translations/untranslated.h b/radio/src/translations/untranslated.h index c2b482f0ef7..f18aaa9df2d 100644 --- a/radio/src/translations/untranslated.h +++ b/radio/src/translations/untranslated.h @@ -28,6 +28,8 @@ * \0 -ends current string */ +#include "MultiProtoDefs.h" + #if defined(PCBX12S) #define TR_POTS_VSRCRAW STR_CHAR_POT"S1", STR_CHAR_POT"6P", STR_CHAR_POT"S2", STR_CHAR_TRIM"L1", STR_CHAR_TRIM"L2", STR_CHAR_SLIDER"LS", STR_CHAR_SLIDER"RS", STR_CHAR_POT"JSx", STR_CHAR_POT"JSy" #define TR_SW_VSRCRAW STR_CHAR_SWITCH"SA", STR_CHAR_SWITCH"SB", STR_CHAR_SWITCH"SC", STR_CHAR_SWITCH"SD", STR_CHAR_SWITCH"SE", STR_CHAR_SWITCH"SF", STR_CHAR_SWITCH"SG", STR_CHAR_SWITCH"SH", STR_CHAR_SWITCH"SI", STR_CHAR_SWITCH"SJ" @@ -138,13 +140,7 @@ #define TR_DSM_PROTOCOLS "LP45","DSM2","DSMX" -#define TR_MULTI_PROTOCOLS "FlySky","Hubsan","FrSkyD","Hisky","V2x2","DSM","Devo","YD717","KN","SymaX","SLT","CX10","CG023", \ - "Bayang","FrSkyX","ESky","MT99XX","MJXq","Shenqi","FY326","Futaba","J6 Pro","FQ777","Assan","FrSkyV","Hontai","OpenLrs","FlSky2A","Q2x2","Walkera", \ - "Q303","GW008","DM002","Cabell","Esky150","H8 3D","Corona","CFlie","Hitec","WFly","Bugs","BugMini","Traxxas","NCC1701","E01X", \ - "V911S","GD00X","V761","KF606","Redpine","Potensi","ZSX","Height","Scanner","FrSkyRX","FS2A_RX","HoTT","FX816","BayanRX","Pelikan","Tiger", \ - "XK","XN297DU","FrSkyX2","FrSkyR9","Propel","FrSkyL","Skyartc","ESky-v2","DSM RX","JJRC345","Q90C","Kyosho","RadLink","ExpLRS","Realacc", \ - "OMP","M-Link","Wfly 2","E016Hv2","E010r5","LOLI","E129","JOYSWAY","E016H","Config","IKEA","WILLIFM","Losi","MouldKg","Xerall","MT99XX2", \ - "Kyosho2" +#define TR_MULTI_PROTOCOLS PROTO_NAMES #define TR_MULTI_POWER "1.6mW","2.0mW","2.5mW","3.2mW","4.0mW","5.0mW","6.3mW","7.9mW","10mW","13mW","16mW","20mW","25mW","32mW","40mW","50mW" #define TR_MULTI_WBUS_MODE "WBUS","PPM"