From 80b406b8d93e4ec1154518f3537b0702fd56e8b8 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sun, 10 Apr 2016 19:18:10 +0200 Subject: [PATCH] Implement new protocols of Multimodule (SFHSS and D16 8ch) --- radio/src/gui/taranis/menu_model_setup.cpp | 7 ++-- radio/src/myeeprom.h | 1 + radio/src/pulses/multi_arm.cpp | 12 ++++-- radio/src/translations.cpp | 1 + radio/src/translations.h | 4 +- radio/src/translations/cz.h.txt | 8 ++-- radio/src/translations/de.h.txt | 7 ++-- radio/src/translations/en.h.txt | 8 ++-- radio/src/translations/es.h.txt | 8 ++-- radio/src/translations/fi.h.txt | 8 ++-- radio/src/translations/fr.h.txt | 8 ++-- radio/src/translations/it.h.txt | 8 ++-- radio/src/translations/nl.h.txt | 8 ++-- radio/src/translations/pl.h.txt | 48 +++++++++++++++++++++- radio/src/translations/pt.h.txt | 8 ++-- radio/src/translations/se.h.txt | 7 ++-- 16 files changed, 105 insertions(+), 46 deletions(-) diff --git a/radio/src/gui/taranis/menu_model_setup.cpp b/radio/src/gui/taranis/menu_model_setup.cpp index b06844a9c..84f7b1c90 100644 --- a/radio/src/gui/taranis/menu_model_setup.cpp +++ b/radio/src/gui/taranis/menu_model_setup.cpp @@ -196,7 +196,7 @@ int getSwitchWarningsCount() #define TRAINER_CHANNELS_ROWS() IF_TRAINER_ON(1) #define PORT_CHANNELS_ROWS(x) (x==INTERNAL_MODULE ? INTERNAL_MODULE_CHANNELS_ROWS : (x==EXTERNAL_MODULE ? EXTERNAL_MODULE_CHANNELS_ROWS : TRAINER_CHANNELS_ROWS())) #if defined MULTIMODULE -#define MULTIMODULE_HASOPTIONS(x) (x == MM_RF_PROTO_HUBSAN || x == MM_RF_PROTO_FRSKY || x == MM_RF_PROTO_DSM2 || x >= MM_RF_PROTO_CUSTOM) +#define MULTIMODULE_HASOPTIONS(x) (x == MM_RF_PROTO_HUBSAN || x == MM_RF_PROTO_FRSKY || x == MM_RF_PROTO_DSM2 || x == MM_RF_PROTO_SFHSS || x >= MM_RF_PROTO_CUSTOM) #define MULTIMODULE_FAILSAFEROWS(x) (IS_MODULE_MULTIMODULE(x) && (MULTIMODULE_HASOPTIONS(g_model.moduleData[x].multi.rfProtocol))) ? (uint8_t) 1: HIDDEN_ROW #else #define MULTIMODULE_FAILSAFEROWS(x) HIDDEN_ROW @@ -696,7 +696,7 @@ void menuModelSetup(uint8_t event) lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN+11*FW, y, STR_SUBTYPE_FLYSKY, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==2 ? attr : 0); break; case MM_RF_PROTO_FRSKY: - lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN+11*FW, y, STR_XJT_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].subType+1, menuHorizontalPosition==2 ? attr : 0); + lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN+11*FW, y, STR_SUBTYPE_FRSKY, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==2 ? attr : 0); break; case MM_RF_PROTO_HISKY: lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN+10*FW, y, STR_SUBTYPE_HISKY, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==2 ? attr : 0); @@ -764,11 +764,11 @@ void menuModelSetup(uint8_t event) case MM_RF_PROTO_DSM2: case MM_RF_PROTO_SYMAX: case MM_RF_PROTO_KN: - case MM_RF_PROTO_FRSKY: CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 1); break; case MM_RF_PROTO_CG023: case MM_RF_PROTO_MT99XX: + case MM_RF_PROTO_FRSKY: CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 2); break; case MM_RF_PROTO_FLYSKY: @@ -940,6 +940,7 @@ void menuModelSetup(uint8_t event) else if (IS_MODULE_MULTIMODULE(moduleIdx)) { switch (g_model.moduleData[moduleIdx].multi.rfProtocol) { case MM_RF_PROTO_FRSKY: + case MM_RF_PROTO_SFHSS: lcd_putsLeft(y, STR_MULTI_RFTUNE); break; case MM_RF_PROTO_HUBSAN: diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index dd67f6878..405a569eb 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -516,6 +516,7 @@ enum MultiModuleRFProtocols { MM_RF_PROTO_MJXQ, MM_RF_PROTO_SHENQI, MM_RF_PROTO_FY326, + MM_RF_PROTO_SFHSS, MM_RF_PROTO_CUSTOM, MM_RF_PROTO_LAST= MM_RF_PROTO_CUSTOM }; diff --git a/radio/src/pulses/multi_arm.cpp b/radio/src/pulses/multi_arm.cpp index 841e758a9..a16c32172 100644 --- a/radio/src/pulses/multi_arm.cpp +++ b/radio/src/pulses/multi_arm.cpp @@ -138,11 +138,17 @@ void setupPulsesMultimodule(unsigned int port) type= type +1; if (g_model.moduleData[port].multi.rfProtocol == MM_RF_PROTO_FRSKY) { - if(subtype == 1) + if(subtype == 1) { + //D8 type = 3; - else + subtype = 0; + } else { type = 15; - subtype = 0; + if (subtype==2) // D16 8ch + subtype=1; + else + subtype=0; // D16 + } } if (g_model.moduleData[port].multi.rfProtocol >= MM_RF_PROTO_CUSTOM) diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index f1d29b048..199b58d0c 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -110,6 +110,7 @@ const pm_char STR_OPEN9X[] PROGMEM = #if defined(MULTIMODULE) ISTR(MULTI_PROTOCOLS) ISTR(SUBTYPE_FLYSKY) + ISTR(SUBTYPE_FRSKY) ISTR(SUBTYPE_HISKY) ISTR(SUBTYPE_YD717) ISTR(SUBTYPE_SYMAX) diff --git a/radio/src/translations.h b/radio/src/translations.h index 4e39a64e4..eced1462e 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -192,7 +192,8 @@ extern const pm_char STR_OPEN9X[]; #if defined(MULTIMODULE) #define OFS_MULTI_PROTOCOLS (OFS_DSM_PROTOCOLS + sizeof(TR_DSM_PROTOCOLS)) #define OFS_SUBTYPE_FLYSKY (OFS_MULTI_PROTOCOLS + sizeof(TR_MULTI_PROTOCOLS)) - #define OFS_SUBTYPE_HISKY (OFS_SUBTYPE_FLYSKY + sizeof(TR_SUBTYPE_FLYSKY)) + #define OFS_SUBTYPE_FRSKY (OFS_SUBTYPE_FLYSKY + sizeof(TR_SUBTYPE_FLYSKY)) + #define OFS_SUBTYPE_HISKY (OFS_SUBTYPE_FRSKY + sizeof(TR_SUBTYPE_FRSKY)) #define OFS_SUBTYPE_YD717 (OFS_SUBTYPE_HISKY + sizeof(TR_SUBTYPE_HISKY)) #define OFS_SUBTYPE_SYMAX (OFS_SUBTYPE_YD717 + sizeof(TR_SUBTYPE_YD717)) #define OFS_SUBTYPE_CX10 (OFS_SUBTYPE_SYMAX + sizeof(TR_SUBTYPE_SYMAX)) @@ -323,6 +324,7 @@ extern const pm_char STR_OPEN9X[]; #if defined(MULTIMODULE) #define STR_MULTI_PROTOCOLS (STR_OPEN9X + OFS_MULTI_PROTOCOLS) #define STR_SUBTYPE_FLYSKY (STR_OPEN9X + OFS_SUBTYPE_FLYSKY) + #define STR_SUBTYPE_FRSKY (STR_OPEN9X + OFS_SUBTYPE_FRSKY) #define STR_SUBTYPE_HISKY (STR_OPEN9X + OFS_SUBTYPE_HISKY) #define STR_SUBTYPE_YD717 (STR_OPEN9X + OFS_SUBTYPE_YD717) #define STR_SUBTYPE_SYMAX (STR_OPEN9X + OFS_SUBTYPE_SYMAX) diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 57b955ff9..142b296b9 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -104,13 +104,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""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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" -// SUBTYPE FOR FRSKY use TR_XJT_PROTOCOLS with offset +1 - +#define LEN_SUBTYPE_FRSKY "007" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -1233,4 +1233,4 @@ #define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_QUALITY "TQly" -#define ZSTR_TX_SNR "TSNR" \ No newline at end of file +#define ZSTR_TX_SNR "TSNR" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index f3fecdc41..52b768510 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -109,12 +109,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 ""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""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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" -// SUBTYPE für FRSKY nutzt TR_XJT_PROTOCOLS mit Offset +1 +#define LEN_SUBTYPE_FRSKY "\007" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -1235,4 +1236,4 @@ #define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_QUALITY "TQly" -#define ZSTR_TX_SNR "TSNR" \ No newline at end of file +#define ZSTR_TX_SNR "TSNR" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index c82a7a053..ca976047e 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -104,13 +104,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""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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" -// SUBTYPE FOR FRSKY use TR_XJT_PROTOCOLS with offset +1 - +#define LEN_SUBTYPE_FRSKY "\007" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -1250,4 +1250,4 @@ #define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_QUALITY "TQly" -#define ZSTR_TX_SNR "TSNR" \ No newline at end of file +#define ZSTR_TX_SNR "TSNR" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 52c36711e..4fb4eb1df 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -104,13 +104,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""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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" -// SUBTYPE FOR FRSKY use TR_XJT_PROTOCOLS with offset +1 - +#define LEN_SUBTYPE_FRSKY "007" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -1196,4 +1196,4 @@ #define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_QUALITY "TQly" -#define ZSTR_TX_SNR "TSNR" \ No newline at end of file +#define ZSTR_TX_SNR "TSNR" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 6491c7181..f19995340 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -104,13 +104,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""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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" -// SUBTYPE FOR FRSKY use TR_XJT_PROTOCOLS with offset +1 - +#define LEN_SUBTYPE_FRSKY "007" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -1196,4 +1196,4 @@ #define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_QUALITY "TQly" -#define ZSTR_TX_SNR "TSNR" \ No newline at end of file +#define ZSTR_TX_SNR "TSNR" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index f12dd336c..502653276 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -104,13 +104,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""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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" -// SUBTYPE FOR FRSKY use TR_XJT_PROTOCOLS with offset +1 - +#define LEN_SUBTYPE_FRSKY "007" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -1223,4 +1223,4 @@ #define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_QUALITY "TQly" -#define ZSTR_TX_SNR "TSNR" \ No newline at end of file +#define ZSTR_TX_SNR "TSNR" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index ed0e30f7c..09c6dea86 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -104,13 +104,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""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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" -// SUBTYPE FOR FRSKY use TR_XJT_PROTOCOLS with offset +1 - +#define LEN_SUBTYPE_FRSKY "007" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -1232,4 +1232,4 @@ #define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_QUALITY "TQly" -#define ZSTR_TX_SNR "TSNR" \ No newline at end of file +#define ZSTR_TX_SNR "TSNR" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index c0542d7a4..5a3b23a04 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -105,13 +105,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""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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" -// SUBTYPE FOR FRSKY use TR_XJT_PROTOCOLS with offset +1 - +#define LEN_SUBTYPE_FRSKY "007" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -1247,4 +1247,4 @@ #define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_QUALITY "TQly" -#define ZSTR_TX_SNR "TSNR" \ No newline at end of file +#define ZSTR_TX_SNR "TSNR" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index a7247f150..e83e1c519 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -96,7 +96,7 @@ #define TR_COUNTRYCODES TR("US""JP""EU", "Ameryka""Japonia""Europa\0") #define LEN_TARANIS_PROTOCOLS "\004" -#define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2""CRSF" +#define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2""CRSF""MULT" #define LEN_XJT_PROTOCOLS "\004" #define TR_XJT_PROTOCOLS "OFF\0""D16\0""D8\0 ""LR12" @@ -104,6 +104,44 @@ #define LEN_DSM_PROTOCOLS "\004" #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""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 LEN_SUBTYPE_HISKY "\005" +#define TR_SUBTYPE_HISKY "HiSky""HK310" + +// SUBTYPE FOR DSMX use TR_DSM_PROTOCOLS with offset +1 + +#define LEN_SUBTYPE_YD717 "\007" +#define TR_SUBTYPE_YD717 "YD717\0 ""SKYWLKR""Syma X2""XINXUN\0""NIHUI\0 " + +#define LEN_SUBTYPE_SYMAX "\003" +#define TR_SUBTYPE_SYMAX "Std""5c\0" + +#define LEN_SUBTYPE_CX10 "\007" +#define TR_SUBTYPE_CX10 "Green\0 ""Blue\0 ""DM007\0 ""Q282\0 ""JC3015a""JC3015b""MK33041""Q242\0 " + +#define LEN_SUBTYPE_CG023 "\005" +#define TR_SUBTYPE_CG023 "CG023""YD829""H3 3d" + +#define LEN_SUBTYPE_KN "\006" +#define TR_SUBTYPE_KN "WLtoys""FeiLun" + +#define LEN_SUBTYPE_MT99 "\004" +#define TR_SUBTYPE_MT99 "MT99""H7\0 ""YZ\0 " + +#define LEN_SUBTYPE_MJXQ "\005" +#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D" + +#define LEN_OPTIONS_DSM "\011" +#define TR_OPTIONS_DSM " 4ch 22ms"" 5ch 22ms"" 6ch 22ms"" 7ch 22ms"" 4ch 11ms"" 5ch 11ms"" 6ch 11ms"" 7ch 11ms"" 8ch 22ms"" 9ch 22ms""10ch 22ms""11ch 22ms""12ch 22ms" + #define LEN_VTRIMINC TR("\006", "\013") /*11 decimal*/ #define TR_VTRIMINC TR("Expo\0 ""B.Dokł""Dokł.\0""Średni""Zgrubn", "Expotencja ""B.Dokładny\0""Dokładny\0 ""Średni\0 ""Zgrubny\0 ") @@ -811,6 +849,12 @@ #else #define TR_RXNUM "NumOdb" #endif +#define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune" +#define TR_MULTI_VIDFREQ INDENT "Video frequency" +#define TR_MULTI_DSMFRAME INDENT "DSM frame format" +#define TR_MULTI_OPTION INDENT "Option value" +#define TR_MULTI_AUTOBIND INDENT "Autobind" +#define TR_MULTI_LOWPOWER INDENT "Low power mode" #define TR_SYNCMENU "[Synch]" #define TR_LIMIT INDENT "Limit" #define TR_MINRSSI "Min Rssi" @@ -1190,4 +1234,4 @@ #define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_QUALITY "TQly" -#define ZSTR_TX_SNR "TSNR" \ No newline at end of file +#define ZSTR_TX_SNR "TSNR" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 0847a0e7f..bebf620a7 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -104,12 +104,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""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""Custom" + #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" -// SUBTYPE FOR FRSKY use TR_XJT_PROTOCOLS with offset +1 +#define LEN_SUBTYPE_FRSKY "\007" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -1190,4 +1192,4 @@ #define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_QUALITY "TQly" -#define ZSTR_TX_SNR "TSNR" \ No newline at end of file +#define ZSTR_TX_SNR "TSNR" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 91130f810..604669621 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -104,12 +104,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""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""Custom" #define LEN_SUBTYPE_FLYSKY "\004" #define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" -// SUBTYPE FOR FRSKY use TR_XJT_PROTOCOLS with offset +1 +#define LEN_SUBTYPE_FRSKY "\007" +#define TR_SUBTYPE_FRSKY "D16\0 ""D8\0 ""D16 8ch" #define LEN_SUBTYPE_HISKY "\005" #define TR_SUBTYPE_HISKY "HiSky""HK310" @@ -1247,4 +1248,4 @@ #define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_QUALITY "TQly" -#define ZSTR_TX_SNR "TSNR" \ No newline at end of file +#define ZSTR_TX_SNR "TSNR"