fix: Update built-in Multi-protocol module protocol lists, single source for firmware and cpn (#3435)
* - Concentrated Multi protocol definitions into a consistent single source. Actually two .h files, one for the protocol list and names, the other for subtypes and capababilites, see comments in .h files as to why - updated available protocols reflecting 1.3.3.20 (15+ protocols) - fixed Companion always showing f/s and channel map options in model setup disregarding the protocol capability * Following @pfeerick's review: changed heaeders and typos fixed Ubuntu runtime error on assert fixed change of Multi protocol not triggering writing yaml file * corrected copy/paste error * fixed FrSky index juggling * Updated Multiprotocol database to current MPM project status (ref. MPM Multiprotos.ino) - changed protocol name FX816 to FX - added Flysky AFHDS2A options PPM and PPWM SBUS 16ch subtypes "PWM,SB16" and "PPM,SB16 - added V761 option to select TOPRC - added FX options "816" and "620" - added FRSKYR9 option "-- 8ch" * MPM protocol scan excludes some protocols which are not meant to be selected. For Companion and Simualtor (and for radios if there is no MPM connected) this was handled in different places with outdated information. Harmonized and centralized the handling of non-selectabale protocols into the single source for all companion, Simulator and all gui types. * More cleanup: - changed some MPM protocol names to the ones the MPM delivers with MPM protocol scan to harmonize names between CPN/Simulator/radio - added XN2927DUMP and MOULDKG to the list of excluded MPM protocols just like the MPM does with MPM protocol scan - added new option value limits and moved definitions to single source - adapted CPN and radio to use common definitions of option values for all GUI types - moved distributed MPM (as far as possible) to one coherent place under a single #if defined (MULTIMODULE) - fixed option value not reset at change of protocol - some editorial stuff Note: There is still some work to be done on CPN GUI option values. DSM2 servo rates are hard coded, BAYANG telemetry options are only shown by index and not by text as in radio code, AFHDS2A servo update rate is shown as index too which is to no use for users. I'll try to fix all this in the next session, but request to get rid of BAYANG telemetry options translations. It is much easier to define a common string list by using untranslated.h * rebase due to fr.h * resolve merge conflict with main fr.h * more cleanup: - deleted multiple definition of MM_RF_CUSTOM_SELECTED in favor of single source define - bw radios: change to only allow defined protocols rather than a fixed 127 protocols * Changes: - magic sentinel number 0xfe as define - add 10 NN protocol entries for future use of new MPM protocols not yet defined in ETX (still recommend timely ETX maintenance update if MPM releases new firmware) * Changes by @elecpower: - align field labels to radio - change servo update frequency from combo box to spin box with edit only via up/down arrows to stop invalid values being entered via keyboard. Remove frequency list used to populate combo box as only used by Companion. - add validation to module yaml decode checking for unsupported multi protocols and/or multi protocol sub types and if unsupported set module to OFF just to be safe. * Changes: - radio: added validation to module yaml decode checking for unsupported multi protocols and/or multi protocol sub types and if unsupported set module to OFF just to be safe. * CPN: use sentinel define * cpn: Sort multi protocols list (courtesy @elecpower) * fixes #3480 changes: - moved FrSky subtype defines to MultiProtoDefs.h - updated bind_button_driver.cpp * missed replacing one instance of setMultiProtocol() * changes: - editorial change - added multi option to OMP protocol (ref #2713) * rather go for STR_MULTI_RFTUNE because MPM manual talks about RF tune * made XN297_DUMP selectable (available with MPM debug fw only) * corrected merge mistakes
This commit is contained in:
Michael
@@ -22,6 +22,9 @@
|
||||
#include "opentx.h"
|
||||
#include "hal/module_port.h"
|
||||
|
||||
#undef CPN
|
||||
#include "MultiSubtypeDefs.h"
|
||||
|
||||
#if defined(PCBFRSKY) || defined(PCBFLYSKY)
|
||||
uint8_t switchToMix(uint8_t source)
|
||||
{
|
||||
@@ -1110,179 +1113,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, 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_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;
|
||||
|
||||
Reference in New Issue
Block a user