diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index 44650a67b..b75a877e6 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -1860,12 +1860,12 @@ unsigned int getNumSubtypes(MultiModuleRFProtocols type) { case MM_RF_PROTO_SYMAX: case MM_RF_PROTO_KN: case MM_RF_PROTO_SLT: - case MM_RF_PROTO_Q2X2: case MM_RF_PROTO_FY326: case MM_RF_PROTO_BAYANG: case MM_RF_PROTO_V2X2: return 2; + case MM_RF_PROTO_Q2X2: case MM_RF_PROTO_CG023: return 3; @@ -1881,6 +1881,9 @@ unsigned int getNumSubtypes(MultiModuleRFProtocols type) { case MM_RF_PROTO_YD717: return 5; + case MM_RF_PROTO_WALKERA_2x01: + return 6; + case MM_RF_PROTO_CX10: return 8; default: diff --git a/companion/src/modelprinter.cpp b/companion/src/modelprinter.cpp index 24fd230a9..789c20d4b 100644 --- a/companion/src/modelprinter.cpp +++ b/companion/src/modelprinter.cpp @@ -159,7 +159,8 @@ QString ModelPrinter::printMultiSubType(int rfProtocol, bool custom, int subType static const char *fy326_strings[] = {"FY326", "FY319"}; static const char *hontai_strings[] = {"Standard", "JJRC X1", "X5C1 Clone"}; static const char *afhds2a_strings[] = {"PWM and IBUS", "PPM and IBUS", "PWM and SBUS", "PPM and SBUS"}; - static const char *q2x2_strings[] = {"Q242", "Q282"}; + static const char *q2x2_strings[] = {"Q222", "Q242", "Q282"}; + static const char *walkera_wk2x01_strings[] = {"WK2801", "WK2401", "W6_5_1", "W6_6_1", "W6_HEL", "W6_HEL_I"}; if (custom) return CHECK_IN_ARRAY(custom_subtype_strings, subType); @@ -201,6 +202,8 @@ QString ModelPrinter::printMultiSubType(int rfProtocol, bool custom, int subType return CHECK_IN_ARRAY(afhds2a_strings, subType); case MM_RF_PROTO_Q2X2: return CHECK_IN_ARRAY(q2x2_strings, subType); + case MM_RF_PROTO_WALKERA_2x01: + return CHECK_IN_ARRAY(walkera_wk2x01_strings, subType); default: return "DEFAULT"; } diff --git a/radio/src/gui/gui_common_arm.cpp b/radio/src/gui/gui_common_arm.cpp index eac9d896c..b491b1023 100644 --- a/radio/src/gui/gui_common_arm.cpp +++ b/radio/src/gui/gui_common_arm.cpp @@ -617,6 +617,7 @@ const mm_protocol_definition multi_protocols[] = { { MM_RF_PROTO_OLRS, nullptr, 0, STR_MULTI_RFPOWER }, { MM_RF_PROTO_FS_AFHDS2A, STR_SUBTYPE_AFHDS2A, 3, STR_MULTI_SERVOFREQ }, { MM_RF_PROTO_Q2X2, STR_SUBTYPE_Q2X2, 1, nullptr }, + { MM_RF_PROTO_WK_2X01, STR_SUBTYPE_WK2x01, 5, nullptr }, { MM_RF_CUSTOM_SELECTED, nullptr, 7, STR_MULTI_OPTION }, //Sential and default for protocols not listed above (MM_RF_CUSTOM is 0xff() diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 59a623cc3..2b3f0856f 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -529,7 +529,8 @@ enum MultiModuleRFProtocols { MM_RF_PROTO_OLRS, MM_RF_PROTO_FS_AFHDS2A, MM_RF_PROTO_Q2X2, - MM_RF_PROTO_LAST= MM_RF_PROTO_Q2X2 + MM_RF_PROTO_WK_2X01, + MM_RF_PROTO_LAST= MM_RF_PROTO_WK_2X01 }; enum MMDSM2Subtypes { diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 286c1df21..6390b6780 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1785,7 +1785,11 @@ void doMixerCalculations() #if defined(PXX) || defined(DSM2) static uint8_t countRangecheck = 0; for (uint8_t i=0; i= 250) { countRangecheck = 0; AUDIO_PLAY(AU_SPECIAL_SOUND_CHEEP); diff --git a/radio/src/telemetry/multi.h b/radio/src/telemetry/multi.h index 5a07de852..d51d7c0c3 100644 --- a/radio/src/telemetry/multi.h +++ b/radio/src/telemetry/multi.h @@ -86,8 +86,6 @@ Type 0x06 Flysky AFHDS2 telemetry data void processMultiTelemetryData(uint8_t data); -#define MULTISTATUS_FLAG - struct MultiModuleStatus { uint8_t major; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index ba12cde88..6edcda8b0 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -127,6 +127,7 @@ const pm_char STR_OPEN9X[] PROGMEM = ISTR(SUBTYPE_HONTAI) ISTR(SUBTYPE_AFHDS2A) ISTR(SUBTYPE_Q2X2) + ISTR(SUBTYPE_WK2x01) ISTR(SUBTYPE_V2X2) ISTR(SUBTYPE_BAYANG) ISTR(SUBTYPE_FY326) diff --git a/radio/src/translations.h b/radio/src/translations.h index c666a9ff6..68702fd79 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -228,7 +228,8 @@ extern const pm_char STR_OPEN9X[]; #define OFS_SUBTYPE_HONTAI (OFS_SUBTYPE_MJXQ + sizeof(TR_SUBTYPE_MJXQ)) #define OFS_SUBTYPE_AFHDS2A (OFS_SUBTYPE_HONTAI + sizeof(TR_SUBTYPE_HONTAI)) #define OFS_SUBTYPE_Q2X2 (OFS_SUBTYPE_AFHDS2A + sizeof(TR_SUBTYPE_AFHDS2A)) - #define OFS_SUBTYPE_V2X2 (OFS_SUBTYPE_Q2X2 + sizeof(TR_SUBTYPE_Q2X2)) + #define OFS_SUBTYPE_WK2x01 (OFS_SUBTYPE_Q2X2 + sizeof(TR_SUBTYPE_Q2X2)) + #define OFS_SUBTYPE_V2X2 (OFS_SUBTYPE_WK2x01 + sizeof(TR_SUBTYPE_WK2x01)) #define OFS_SUBTYPE_BAYANG (OFS_SUBTYPE_V2X2 + sizeof(TR_SUBTYPE_V2X2)) #define OFS_SUBTYPE_FY326 (OFS_SUBTYPE_BAYANG + sizeof(TR_SUBTYPE_BAYANG)) #define OFS_VOLTSRC (OFS_SUBTYPE_FY326 + sizeof(TR_SUBTYPE_FY326)) @@ -368,6 +369,7 @@ extern const pm_char STR_OPEN9X[]; #define STR_SUBTYPE_HONTAI (STR_OPEN9X + OFS_SUBTYPE_HONTAI) #define STR_SUBTYPE_AFHDS2A (STR_OPEN9X + OFS_SUBTYPE_AFHDS2A) #define STR_SUBTYPE_Q2X2 (STR_OPEN9X + OFS_SUBTYPE_Q2X2) + #define STR_SUBTYPE_WK2x01 (STR_OPEN9X + OFS_SUBTYPE_WK2x01) #define STR_SUBTYPE_V2X2 (STR_OPEN9X + OFS_SUBTYPE_V2X2) #define STR_SUBTYPE_BAYANG (STR_OPEN9X + OFS_SUBTYPE_BAYANG) #define STR_SUBTYPE_FY326 (STR_OPEN9X + OFS_SUBTYPE_FY326) diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 6b3130ca3..e36bc05aa 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -107,7 +107,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 ""Walk.\0" #define TR_MULTI_CUSTOM "Custom" @@ -154,7 +154,10 @@ #define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln" #define LEN_SUBTYPE_Q2X2 "\004" -#define TR_SUBTYPE_Q2X2 "Q242""Q282" +#define TR_SUBTYPE_Q2X2 "Q222""Q242""Q282" + +#define LEN_SUBTYPE_WK2x01 "\006" +#define TR_SUBTYPE_WK2x01 "WK2801""WK2401""W6_5_1""W6_6_1""W6_Hel""W6_HeI" #define LEN_SUBTYPE_V2X2 "\006" #define TR_SUBTYPE_V2X2 "V2x2\0 ""JXD506" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index b6b1b2337..9cb26d944 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -159,7 +159,10 @@ #define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln" #define LEN_SUBTYPE_Q2X2 "\004" -#define TR_SUBTYPE_Q2X2 "Q242""Q282" +#define TR_SUBTYPE_Q2X2 "Q222""Q242""Q282" + +#define LEN_SUBTYPE_WK2x01 "\006" +#define TR_SUBTYPE_WK2x01 "WK2801""WK2401""W6_5_1""W6_6_1""W6_Hel""W6_HeI" #define LEN_SUBTYPE_V2X2 "\006" #define TR_SUBTYPE_V2X2 "V2x2\0 ""JXD506" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 06d7d32b7..6fc9baf0b 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -111,7 +111,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 ""Walk.\0" #define TR_MULTI_CUSTOM "Custom" @@ -158,7 +158,10 @@ #define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln" #define LEN_SUBTYPE_Q2X2 "\004" -#define TR_SUBTYPE_Q2X2 "Q242""Q282" +#define TR_SUBTYPE_Q2X2 "Q222""Q242""Q282" + +#define LEN_SUBTYPE_WK2x01 "\006" +#define TR_SUBTYPE_WK2x01 "WK2801""WK2401""W6_5_1""W6_6_1""W6_Hel""W6_HeI" #define LEN_SUBTYPE_V2X2 "\006" #define TR_SUBTYPE_V2X2 "V2x2\0 ""JXD506" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index bc5f124bc..508e12e22 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -107,7 +107,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 ""Walk.\0"" #define TR_MULTI_CUSTOM "Custom" @@ -154,7 +154,10 @@ #define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln" #define LEN_SUBTYPE_Q2X2 "\004" -#define TR_SUBTYPE_Q2X2 "Q242""Q282" +#define TR_SUBTYPE_Q2X2 "Q222""Q242""Q282" + +#define LEN_SUBTYPE_WK2x01 "\006" +#define TR_SUBTYPE_WK2x01 "WK2801""WK2401""W6_5_1""W6_6_1""W6_Hel""W6_HeI" #define LEN_SUBTYPE_V2X2 "\006" #define TR_SUBTYPE_V2X2 "V2x2\0 ""JXD506" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index e930c733b..a0f7eae72 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -107,7 +107,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 ""Walk.\0" #define TR_MULTI_CUSTOM "Custom" @@ -154,7 +154,10 @@ #define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln" #define LEN_SUBTYPE_Q2X2 "\004" -#define TR_SUBTYPE_Q2X2 "Q242""Q282" +#define TR_SUBTYPE_Q2X2 "Q222""Q242""Q282" + +#define LEN_SUBTYPE_WK2x01 "\006" +#define TR_SUBTYPE_WK2x01 "WK2801""WK2401""W6_5_1""W6_6_1""W6_Hel""W6_HeI" #define LEN_SUBTYPE_V2X2 "\006" #define TR_SUBTYPE_V2X2 "V2x2\0 ""JXD506" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 8b609f43a..77794def3 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -107,7 +107,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 ""Walk.\0" #define TR_MULTI_CUSTOM "Perso" @@ -154,7 +154,10 @@ #define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln" #define LEN_SUBTYPE_Q2X2 "\004" -#define TR_SUBTYPE_Q2X2 "Q242""Q282" +#define TR_SUBTYPE_Q2X2 "Q222""Q242""Q282" + +#define LEN_SUBTYPE_WK2x01 "\006" +#define TR_SUBTYPE_WK2x01 "WK2801""WK2401""W6_5_1""W6_6_1""W6_Hel""W6_HeI" #define LEN_SUBTYPE_V2X2 "\006" #define TR_SUBTYPE_V2X2 "V2x2\0 ""JXD506" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index dd00a1168..81e99ddc8 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -107,7 +107,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 ""Walk.\0" #define TR_MULTI_CUSTOM "Custom" @@ -154,7 +154,10 @@ #define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln" #define LEN_SUBTYPE_Q2X2 "\004" -#define TR_SUBTYPE_Q2X2 "Q242""Q282" +#define TR_SUBTYPE_Q2X2 "Q222""Q242""Q282" + +#define LEN_SUBTYPE_WK2x01 "\006" +#define TR_SUBTYPE_WK2x01 "WK2801""WK2401""W6_5_1""W6_6_1""W6_Hel""W6_HeI" #define LEN_SUBTYPE_V2X2 "\006" #define TR_SUBTYPE_V2X2 "V2x2\0 ""JXD506" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 63b024182..e0f3aa0c6 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -112,7 +112,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 ""Walk.\0" #define TR_MULTI_CUSTOM "Custom" @@ -159,7 +159,10 @@ #define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln" #define LEN_SUBTYPE_Q2X2 "\004" -#define TR_SUBTYPE_Q2X2 "Q242""Q282" +#define TR_SUBTYPE_Q2X2 "Q222""Q242""Q282" + +#define LEN_SUBTYPE_WK2x01 "\006" +#define TR_SUBTYPE_WK2x01 "WK2801""WK2401""W6_5_1""W6_6_1""W6_Hel""W6_HeI" #define LEN_SUBTYPE_V2X2 "\006" #define TR_SUBTYPE_V2X2 "V2x2\0 ""JXD506" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index e995024a9..a09d5ad75 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -108,7 +108,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 ""Walk.\0" #define TR_MULTI_CUSTOM "Custom" @@ -155,7 +155,10 @@ #define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln" #define LEN_SUBTYPE_Q2X2 "\004" -#define TR_SUBTYPE_Q2X2 "Q242""Q282" +#define TR_SUBTYPE_Q2X2 "Q222""Q242""Q282" + +#define LEN_SUBTYPE_WK2x01 "\006" +#define TR_SUBTYPE_WK2x01 "WK2801""WK2401""W6_5_1""W6_6_1""W6_Hel""W6_HeI" #define LEN_SUBTYPE_V2X2 "\006" #define TR_SUBTYPE_V2X2 "V2x2\0 ""JXD506" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index c68a55d03..4ea0982e3 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -107,7 +107,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 ""Walk.\0" #define TR_MULTI_CUSTOM "Custom" @@ -155,7 +155,10 @@ #define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln" #define LEN_SUBTYPE_Q2X2 "\004" -#define TR_SUBTYPE_Q2X2 "Q242""Q282" +#define TR_SUBTYPE_Q2X2 "Q222""Q242""Q282" + +#define LEN_SUBTYPE_WK2x01 "\006" +#define TR_SUBTYPE_WK2x01 "WK2801""WK2401""W6_5_1""W6_6_1""W6_Hel""W6_HeI" #define LEN_SUBTYPE_V2X2 "\006" #define TR_SUBTYPE_V2X2 "V2x2\0 ""JXD506" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index b5080e4ab..7338ac795 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -107,7 +107,7 @@ #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define LEN_MULTI_PROTOCOLS "\006" -#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 " +#define TR_MULTI_PROTOCOLS "FlySky""Hubsan""FrSky\0""Hisky\0""V2x2\0 ""DSM\0 ""Devo\0 ""YD717\0""KN\0 ""SymaX\0""SLT\0 ""CX10\0 ""CG023\0""Bayang""ESky\0 ""MT99XX""MJXQ\0 ""Shenqi""FY326\0""SFHSS\0""J6 PRO""FQ777\0""Assan\0""Hontai""OLRS\0 ""FS 2A\0""Q2x2\0 ""Walk.\0" #define TR_MULTI_CUSTOM "Custom" @@ -154,7 +154,19 @@ #define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln" #define LEN_SUBTYPE_Q2X2 "\004" -#define TR_SUBTYPE_Q2X2 "Q242""Q282" +#define TR_SUBTYPE_Q2X2 "Q222""Q242""Q282" + +#define LEN_SUBTYPE_WK2x01 "\006" +#define TR_SUBTYPE_WK2x01 "WK2801""WK2401""W6_5_1""W6_6_1""W6_Hel""W6_HeI" + +#define LEN_SUBTYPE_V2X2 "\006" +#define TR_SUBTYPE_V2X2 "V2x2\0 ""JXD506" + +#define LEN_SUBTYPE_BAYANG "\006" +#define TR_SUBTYPE_BAYANG "Bayang""H8S3D" + +#define LEN_SUBTYPE_FY326 "\005" +#define TR_SUBTYPE_FY326 "FY326""FY319" #define LEN_VTRIMINC TR("\006","\014") #define TR_VTRIMINC TR("Expo\0 ""xFin\0 ""Fin\0 ""Medium""Grov\0 ","Exponentiell""Extra Fin\0 ""Fin\0 ""Medium\0 ""Grov\0 ")