diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index 069de327b..46b83de7b 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -1843,9 +1843,9 @@ unsigned int getNumSubtypes(MultiModuleRFProtocols type) { return 3; case MM_RF_PROTO_FLYSKY: - case MM_RF_PROTO_MJXQ: return 4; + case MM_RF_PROTO_MJXQ: case MM_RF_PROTO_YD717: return 5; diff --git a/companion/src/modelprinter.cpp b/companion/src/modelprinter.cpp index aea195c24..6d1205d53 100644 --- a/companion/src/modelprinter.cpp +++ b/companion/src/modelprinter.cpp @@ -121,7 +121,7 @@ QString ModelPrinter::printMultiSubType(int rfProtocol, int subType) { /* custom protocols */ static const char *custom_subtype_strings[] = {"Subtype 0","Subtype 1","Subtype 2","Subtype 3","Subtype 4","Subtype 5","Subtype 6","Subtype 7"}; static const char *flysky_strings[] = {"Standard","V9x9","V6x6","V912"}; - static const char *frsky_strings[] = {"D16", "D8", "D16 8ch"}; + static const char *frsky_strings[] = {"D16", "D8", "D16 8ch", "LR12"}; static const char *hisky_strings[] = { "HiSky", "HK310" }; static const char *dsm2_strings[] = {"DSM2", "DSMX"}; static const char *yd717_strings[] = {"YD717", "Skywalker", "Syma X2", "XINXUN", "NIHUI"}; @@ -130,7 +130,7 @@ QString ModelPrinter::printMultiSubType(int rfProtocol, int subType) { static const char *cg023_strings[] = {"CG023", "YD829", "H3 3D"}; static const char* kn_strings[] = {"WLtoys", "FeiLun"}; static const char* mt99_strings[] = {"MT99","H7","YZ"}; - static const char* mjxq_strings[] = {"WLH08", "X600", "X800", "H26D"}; + static const char* mjxq_strings[] = {"WLH08", "X600", "X800", "H26D", "E010"}; if (rfProtocol >= MM_RF_PROTO_CUSTOM) { return CHECK_IN_ARRAY(custom_subtype_strings, subType); diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index dee99f203..2e071418d 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -632,9 +632,9 @@ void menuModelSetup(event_t event) g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol = MM_RF_PROTO_LAST-1; } g_model.moduleData[EXTERNAL_MODULE].subType = 0; - // Sensible default for DSM2 (same as for ppm): 6ch@11ms + // Sensible default for DSM2 (same as for ppm): 6ch@22ms if (g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol == MM_RF_PROTO_DSM2) - g_model.moduleData[EXTERNAL_MODULE].multi.optionValue = MM_RF_DSM2_11MS_6CH_OPTION; + g_model.moduleData[EXTERNAL_MODULE].multi.optionValue = MM_RF_DSM2_22MS_6CH_OPTION; else g_model.moduleData[EXTERNAL_MODULE].multi.optionValue = 0; } @@ -707,14 +707,14 @@ void menuModelSetup(event_t event) CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 1); break; case MM_RF_PROTO_CG023: - case MM_RF_PROTO_FRSKY: CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 2); break; case MM_RF_PROTO_FLYSKY: + case MM_RF_PROTO_FRSKY: case MM_RF_PROTO_MT99XX: - case MM_RF_PROTO_MJXQ: CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 3); break; + case MM_RF_PROTO_MJXQ: case MM_RF_PROTO_YD717: CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 4); break; diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index dd1037392..6849e8ac0 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -782,9 +782,9 @@ void menuModelSetup(event_t event) g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol = MM_RF_PROTO_LAST-1; } g_model.moduleData[EXTERNAL_MODULE].subType = 0; - // Sensible default for DSM2 (same as for ppm): 6ch@11ms + // Sensible default for DSM2 (same as for ppm): 6ch@22ms if (g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol == MM_RF_PROTO_DSM2) - g_model.moduleData[EXTERNAL_MODULE].multi.optionValue = MM_RF_DSM2_11MS_6CH_OPTION; + g_model.moduleData[EXTERNAL_MODULE].multi.optionValue = MM_RF_DSM2_22MS_6CH_OPTION; else g_model.moduleData[EXTERNAL_MODULE].multi.optionValue = 0; } @@ -808,14 +808,14 @@ void menuModelSetup(event_t event) CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 1); break; case MM_RF_PROTO_CG023: - case MM_RF_PROTO_FRSKY: CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 2); break; case MM_RF_PROTO_FLYSKY: case MM_RF_PROTO_MT99XX: - case MM_RF_PROTO_MJXQ: + case MM_RF_PROTO_FRSKY: CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 3); break; + case MM_RF_PROTO_MJXQ: case MM_RF_PROTO_YD717: CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 4); break; diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index 7ec878b8a..2c9d51a5b 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -665,9 +665,9 @@ bool menuModelSetup(event_t event) g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol = MM_RF_PROTO_LAST-1; } g_model.moduleData[EXTERNAL_MODULE].subType = 0; - // Sensible default for DSM2 (same as for ppm): 6ch@11ms + // Sensible default for DSM2 (same as for ppm): 6ch@22ms if (g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol == MM_RF_PROTO_DSM2) - g_model.moduleData[EXTERNAL_MODULE].multi.optionValue = MM_RF_DSM2_11MS_6CH_OPTION; + g_model.moduleData[EXTERNAL_MODULE].multi.optionValue = MM_RF_DSM2_22MS_6CH_OPTION; else g_model.moduleData[EXTERNAL_MODULE].multi.optionValue = 0; } @@ -690,14 +690,14 @@ bool menuModelSetup(event_t event) CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 1); break; case MM_RF_PROTO_CG023: - case MM_RF_PROTO_FRSKY: CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 2); break; case MM_RF_PROTO_FLYSKY: + case MM_RF_PROTO_FRSKY: case MM_RF_PROTO_MT99XX: - case MM_RF_PROTO_MJXQ: CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 3); break; + case MM_RF_PROTO_MJXQ: case MM_RF_PROTO_YD717: CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 4); break; diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 192a83644..c18f4485d 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -527,11 +527,12 @@ enum MultiModuleRFProtocols { MM_RF_PROTO_SFHSS, MM_RF_PROTO_J6PRO, MM_RF_PROTO_FQ777, + MM_RF_PROTO_ASSAN, MM_RF_PROTO_CUSTOM, MM_RF_PROTO_LAST= MM_RF_PROTO_CUSTOM }; -#define MM_RF_DSM2_11MS_6CH_OPTION 6 +#define MM_RF_DSM2_22MS_6CH_OPTION 2 #define HAS_RF_PROTOCOL_FAILSAFE(rf) ((rf) == RF_PROTO_X16) #define HAS_RF_PROTOCOL_MODELINDEX(rf) (((rf) == RF_PROTO_X16) || ((rf) == RF_PROTO_LR12)) diff --git a/radio/src/pulses/multi_arm.cpp b/radio/src/pulses/multi_arm.cpp index ef389fa5e..f6a5ba623 100644 --- a/radio/src/pulses/multi_arm.cpp +++ b/radio/src/pulses/multi_arm.cpp @@ -131,11 +131,19 @@ void setupPulsesMultimodule(uint8_t port) if (type >= 15) type = type + 1; + // 23 is again a FrSky protocol so shift again + if (type >= 23) + type = type + 1; + if (g_model.moduleData[port].multi.rfProtocol == MM_RF_PROTO_FRSKY) { if(subtype == 1) { //D8 type = 3; subtype = 0; + } else if (subtype == 3) { + //LR12 + type = 25; + subtype = 0; } else { type = 15; if (subtype == 2) // D16 8ch diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 276f58839..9afdfc642 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -107,13 +107,13 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #define LEN_SUBTYPE_FRSKY "\007" -#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch""V8\0 " #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -139,7 +139,7 @@ #define TR_SUBTYPE_MT99 "MT99""H7\0 ""YZ\0 ""LS\0 " #define LEN_SUBTYPE_MJXQ "\005" -#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D" +#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0" #define LEN_OPTIONS_DSM "\011" #define TR_OPTIONS_DSM "4ch 22ms\0""5ch 22ms\0""6ch 22ms\0""7ch 22ms\0""4ch 11ms\0""5ch 11ms\0""6ch 11ms\0""7ch 11ms\0""8ch 22ms\0""9ch 22ms\0""10ch 22ms""11ch 22ms""12ch 22ms" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index c3e8ddb74..6ef7d80e6 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -111,13 +111,13 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" //LP45 =Low Power 4 und 5 Kanal #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #define LEN_SUBTYPE_FRSKY "\007" -#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch""V8\0 " #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -143,7 +143,7 @@ #define TR_SUBTYPE_MT99 "MT99""H7\0 ""YZ\0 ""LS\0 " #define LEN_SUBTYPE_MJXQ "\005" -#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D" +#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0" #define LEN_OPTIONS_DSM "\011" #define TR_OPTIONS_DSM "4ch 22ms\0""5ch 22ms\0""6ch 22ms\0""7ch 22ms\0""4ch 11ms\0""5ch 11ms\0""6ch 11ms\0""7ch 11ms\0""8ch 22ms\0""9ch 22ms\0""10ch 22ms""11ch 22ms""12ch 22ms" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 535261072..24e776aed 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -111,13 +111,13 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #define LEN_SUBTYPE_FRSKY "\007" -#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch""V8\0 " #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -143,7 +143,7 @@ #define TR_SUBTYPE_MT99 "MT99""H7\0 ""YZ\0 ""LS\0 " #define LEN_SUBTYPE_MJXQ "\005" -#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D" +#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0" #define LEN_OPTIONS_DSM "\011" #define TR_OPTIONS_DSM "4ch 22ms\0""5ch 22ms\0""6ch 22ms\0""7ch 22ms\0""4ch 11ms\0""5ch 11ms\0""6ch 11ms\0""7ch 11ms\0""8ch 22ms\0""9ch 22ms\0""10ch 22ms""11ch 22ms""12ch 22ms" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index ea5ccef41..8fe773f9c 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -107,13 +107,13 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #define LEN_SUBTYPE_FRSKY "\007" -#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch""V8\0 " #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -139,7 +139,7 @@ #define TR_SUBTYPE_MT99 "MT99""H7\0 ""YZ\0 ""LS\0 " #define LEN_SUBTYPE_MJXQ "\005" -#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D" +#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0" #define LEN_OPTIONS_DSM "\011" #define TR_OPTIONS_DSM "4ch 22ms\0""5ch 22ms\0""6ch 22ms\0""7ch 22ms\0""4ch 11ms\0""5ch 11ms\0""6ch 11ms\0""7ch 11ms\0""8ch 22ms\0""9ch 22ms\0""10ch 22ms""11ch 22ms""12ch 22ms" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index f4a88e9e0..08d163abc 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -107,13 +107,13 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #define LEN_SUBTYPE_FRSKY "\007" -#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch""V8\0 " #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -139,7 +139,7 @@ #define TR_SUBTYPE_MT99 "MT99""H7\0 ""YZ\0 ""LS\0 " #define LEN_SUBTYPE_MJXQ "\005" -#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D" +#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0" #define LEN_OPTIONS_DSM "\011" #define TR_OPTIONS_DSM "4ch 22ms\0""5ch 22ms\0""6ch 22ms\0""7ch 22ms\0""4ch 11ms\0""5ch 11ms\0""6ch 11ms\0""7ch 11ms\0""8ch 22ms\0""9ch 22ms\0""10ch 22ms""11ch 22ms""12ch 22ms" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 22dc13312..735f83022 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -107,13 +107,13 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Perso\0" +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Perso\0" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #define LEN_SUBTYPE_FRSKY "\007" -#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch""V8\0 " #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -139,7 +139,7 @@ #define TR_SUBTYPE_MT99 "MT99""H7\0 ""YZ\0 ""LS\0 " #define LEN_SUBTYPE_MJXQ "\005" -#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D" +#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0" #define LEN_OPTIONS_DSM "\011" #define TR_OPTIONS_DSM "4ch 22ms\0""5ch 22ms\0""6ch 22ms\0""7ch 22ms\0""4ch 11ms\0""5ch 11ms\0""6ch 11ms\0""7ch 11ms\0""8ch 22ms\0""9ch 22ms\0""10ch 22ms""11ch 22ms""12ch 22ms" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index c4958e52a..2a67aecb6 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -107,13 +107,13 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #define LEN_SUBTYPE_FRSKY "\007" -#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch""V8\0 " #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -139,7 +139,7 @@ #define TR_SUBTYPE_MT99 "MT99""H7\0 ""YZ\0 ""LS\0 " #define LEN_SUBTYPE_MJXQ "\005" -#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D" +#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0" #define LEN_OPTIONS_DSM "\011" #define TR_OPTIONS_DSM "4ch 22ms\0""5ch 22ms\0""6ch 22ms\0""7ch 22ms\0""4ch 11ms\0""5ch 11ms\0""6ch 11ms\0""7ch 11ms\0""8ch 22ms\0""9ch 22ms\0""10ch 22ms""11ch 22ms""12ch 22ms" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index d0fcf331d..8090d4a32 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -108,13 +108,13 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #define LEN_SUBTYPE_FRSKY "\007" -#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch""V8\0 " #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -140,7 +140,7 @@ #define TR_SUBTYPE_MT99 "MT99""H7\0 ""YZ\0 ""LS\0 " #define LEN_SUBTYPE_MJXQ "\005" -#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D" +#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0" #define LEN_OPTIONS_DSM "\011" #define TR_OPTIONS_DSM "4ch 22ms\0""5ch 22ms\0""6ch 22ms\0""7ch 22ms\0""4ch 11ms\0""5ch 11ms\0""6ch 11ms\0""7ch 11ms\0""8ch 22ms\0""9ch 22ms\0""10ch 22ms""11ch 22ms""12ch 22ms" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 76e61f956..b82772d62 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -108,13 +108,13 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #define LEN_SUBTYPE_FRSKY "\007" -#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch""V8\0 " #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -140,7 +140,7 @@ #define TR_SUBTYPE_MT99 "MT99""H7\0 ""YZ\0 ""LS\0 " #define LEN_SUBTYPE_MJXQ "\005" -#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D" +#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0" #define LEN_OPTIONS_DSM "\011" #define TR_OPTIONS_DSM "4ch 22ms\0""5ch 22ms\0""6ch 22ms\0""7ch 22ms\0""4ch 11ms\0""5ch 11ms\0""6ch 11ms\0""7ch 11ms\0""8ch 22ms\0""9ch 22ms\0""10ch 22ms""11ch 22ms""12ch 22ms" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 735452308..60f0ee082 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -107,14 +107,14 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #define LEN_SUBTYPE_FRSKY "\007" -#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch""V8\0 " #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -140,7 +140,7 @@ #define TR_SUBTYPE_MT99 "MT99""H7\0 ""YZ\0 ""LS\0 " #define LEN_SUBTYPE_MJXQ "\005" -#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D" +#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0" #define LEN_OPTIONS_DSM "\011" #define TR_OPTIONS_DSM "4ch 22ms\0""5ch 22ms\0""6ch 22ms\0""7ch 22ms\0""4ch 11ms\0""5ch 11ms\0""6ch 11ms\0""7ch 11ms\0""8ch 22ms\0""9ch 22ms\0""10ch 22ms""11ch 22ms""12ch 22ms" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index a4ae8bce5..53c4cc861 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -107,13 +107,13 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM2\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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #define LEN_SUBTYPE_FRSKY "\007" -#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch""V8\0 " #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -139,7 +139,7 @@ #define TR_SUBTYPE_MT99 "MT99""H7\0 ""YZ\0 ""LS\0 " #define LEN_SUBTYPE_MJXQ "\005" -#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D" +#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0" #define LEN_OPTIONS_DSM "\011" #define TR_OPTIONS_DSM "4ch 22ms\0""5ch 22ms\0""6ch 22ms\0""7ch 22ms\0""4ch 11ms\0""5ch 11ms\0""6ch 11ms\0""7ch 11ms\0""8ch 22ms\0""9ch 22ms\0""10ch 22ms""11ch 22ms""12ch 22ms"