1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 17:55:19 +03:00

Implement new protocols of Multimodule (SFHSS and D16 8ch)

This commit is contained in:
Arne Schwabe 2016-04-10 19:18:10 +02:00
parent f99e792dea
commit 80b406b8d9
16 changed files with 105 additions and 46 deletions

View file

@ -196,7 +196,7 @@ int getSwitchWarningsCount()
#define TRAINER_CHANNELS_ROWS() IF_TRAINER_ON(1) #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())) #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 #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 #define MULTIMODULE_FAILSAFEROWS(x) (IS_MODULE_MULTIMODULE(x) && (MULTIMODULE_HASOPTIONS(g_model.moduleData[x].multi.rfProtocol))) ? (uint8_t) 1: HIDDEN_ROW
#else #else
#define MULTIMODULE_FAILSAFEROWS(x) HIDDEN_ROW #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); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN+11*FW, y, STR_SUBTYPE_FLYSKY, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==2 ? attr : 0);
break; break;
case MM_RF_PROTO_FRSKY: 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; break;
case MM_RF_PROTO_HISKY: 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); 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_DSM2:
case MM_RF_PROTO_SYMAX: case MM_RF_PROTO_SYMAX:
case MM_RF_PROTO_KN: case MM_RF_PROTO_KN:
case MM_RF_PROTO_FRSKY:
CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 1); CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 1);
break; break;
case MM_RF_PROTO_CG023: case MM_RF_PROTO_CG023:
case MM_RF_PROTO_MT99XX: case MM_RF_PROTO_MT99XX:
case MM_RF_PROTO_FRSKY:
CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 2); CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 2);
break; break;
case MM_RF_PROTO_FLYSKY: case MM_RF_PROTO_FLYSKY:
@ -940,6 +940,7 @@ void menuModelSetup(uint8_t event)
else if (IS_MODULE_MULTIMODULE(moduleIdx)) { else if (IS_MODULE_MULTIMODULE(moduleIdx)) {
switch (g_model.moduleData[moduleIdx].multi.rfProtocol) { switch (g_model.moduleData[moduleIdx].multi.rfProtocol) {
case MM_RF_PROTO_FRSKY: case MM_RF_PROTO_FRSKY:
case MM_RF_PROTO_SFHSS:
lcd_putsLeft(y, STR_MULTI_RFTUNE); lcd_putsLeft(y, STR_MULTI_RFTUNE);
break; break;
case MM_RF_PROTO_HUBSAN: case MM_RF_PROTO_HUBSAN:

View file

@ -516,6 +516,7 @@ enum MultiModuleRFProtocols {
MM_RF_PROTO_MJXQ, MM_RF_PROTO_MJXQ,
MM_RF_PROTO_SHENQI, MM_RF_PROTO_SHENQI,
MM_RF_PROTO_FY326, MM_RF_PROTO_FY326,
MM_RF_PROTO_SFHSS,
MM_RF_PROTO_CUSTOM, MM_RF_PROTO_CUSTOM,
MM_RF_PROTO_LAST= MM_RF_PROTO_CUSTOM MM_RF_PROTO_LAST= MM_RF_PROTO_CUSTOM
}; };

View file

@ -138,11 +138,17 @@ void setupPulsesMultimodule(unsigned int port)
type= type +1; type= type +1;
if (g_model.moduleData[port].multi.rfProtocol == MM_RF_PROTO_FRSKY) { if (g_model.moduleData[port].multi.rfProtocol == MM_RF_PROTO_FRSKY) {
if(subtype == 1) if(subtype == 1) {
//D8
type = 3; type = 3;
else subtype = 0;
} else {
type = 15; 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) if (g_model.moduleData[port].multi.rfProtocol >= MM_RF_PROTO_CUSTOM)

View file

@ -110,6 +110,7 @@ const pm_char STR_OPEN9X[] PROGMEM =
#if defined(MULTIMODULE) #if defined(MULTIMODULE)
ISTR(MULTI_PROTOCOLS) ISTR(MULTI_PROTOCOLS)
ISTR(SUBTYPE_FLYSKY) ISTR(SUBTYPE_FLYSKY)
ISTR(SUBTYPE_FRSKY)
ISTR(SUBTYPE_HISKY) ISTR(SUBTYPE_HISKY)
ISTR(SUBTYPE_YD717) ISTR(SUBTYPE_YD717)
ISTR(SUBTYPE_SYMAX) ISTR(SUBTYPE_SYMAX)

View file

@ -192,7 +192,8 @@ extern const pm_char STR_OPEN9X[];
#if defined(MULTIMODULE) #if defined(MULTIMODULE)
#define OFS_MULTI_PROTOCOLS (OFS_DSM_PROTOCOLS + sizeof(TR_DSM_PROTOCOLS)) #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_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_YD717 (OFS_SUBTYPE_HISKY + sizeof(TR_SUBTYPE_HISKY))
#define OFS_SUBTYPE_SYMAX (OFS_SUBTYPE_YD717 + sizeof(TR_SUBTYPE_YD717)) #define OFS_SUBTYPE_SYMAX (OFS_SUBTYPE_YD717 + sizeof(TR_SUBTYPE_YD717))
#define OFS_SUBTYPE_CX10 (OFS_SUBTYPE_SYMAX + sizeof(TR_SUBTYPE_SYMAX)) #define OFS_SUBTYPE_CX10 (OFS_SUBTYPE_SYMAX + sizeof(TR_SUBTYPE_SYMAX))
@ -323,6 +324,7 @@ extern const pm_char STR_OPEN9X[];
#if defined(MULTIMODULE) #if defined(MULTIMODULE)
#define STR_MULTI_PROTOCOLS (STR_OPEN9X + OFS_MULTI_PROTOCOLS) #define STR_MULTI_PROTOCOLS (STR_OPEN9X + OFS_MULTI_PROTOCOLS)
#define STR_SUBTYPE_FLYSKY (STR_OPEN9X + OFS_SUBTYPE_FLYSKY) #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_HISKY (STR_OPEN9X + OFS_SUBTYPE_HISKY)
#define STR_SUBTYPE_YD717 (STR_OPEN9X + OFS_SUBTYPE_YD717) #define STR_SUBTYPE_YD717 (STR_OPEN9X + OFS_SUBTYPE_YD717)
#define STR_SUBTYPE_SYMAX (STR_OPEN9X + OFS_SUBTYPE_SYMAX) #define STR_SUBTYPE_SYMAX (STR_OPEN9X + OFS_SUBTYPE_SYMAX)

View file

@ -104,13 +104,13 @@
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
#define LEN_MULTI_PROTOCOLS "\006" #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 LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #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 LEN_SUBTYPE_HISKY "\005"
#define TR_SUBTYPE_HISKY "HiSky""HK310" #define TR_SUBTYPE_HISKY "HiSky""HK310"
@ -1233,4 +1233,4 @@
#define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_POWER "TPWR"
#define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_RSSI "TRSS"
#define ZSTR_TX_QUALITY "TQly" #define ZSTR_TX_QUALITY "TQly"
#define ZSTR_TX_SNR "TSNR" #define ZSTR_TX_SNR "TSNR"

View file

@ -109,12 +109,13 @@
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" //LP45 =Low Power 4 und 5 Kanal #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" //LP45 =Low Power 4 und 5 Kanal
#define LEN_MULTI_PROTOCOLS "\006" #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 LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #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 LEN_SUBTYPE_HISKY "\005"
#define TR_SUBTYPE_HISKY "HiSky""HK310" #define TR_SUBTYPE_HISKY "HiSky""HK310"
@ -1235,4 +1236,4 @@
#define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_POWER "TPWR"
#define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_RSSI "TRSS"
#define ZSTR_TX_QUALITY "TQly" #define ZSTR_TX_QUALITY "TQly"
#define ZSTR_TX_SNR "TSNR" #define ZSTR_TX_SNR "TSNR"

View file

@ -104,13 +104,13 @@
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
#define LEN_MULTI_PROTOCOLS "\006" #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 LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #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 LEN_SUBTYPE_HISKY "\005"
#define TR_SUBTYPE_HISKY "HiSky""HK310" #define TR_SUBTYPE_HISKY "HiSky""HK310"
@ -1250,4 +1250,4 @@
#define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_POWER "TPWR"
#define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_RSSI "TRSS"
#define ZSTR_TX_QUALITY "TQly" #define ZSTR_TX_QUALITY "TQly"
#define ZSTR_TX_SNR "TSNR" #define ZSTR_TX_SNR "TSNR"

View file

@ -104,13 +104,13 @@
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
#define LEN_MULTI_PROTOCOLS "\006" #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 LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #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 LEN_SUBTYPE_HISKY "\005"
#define TR_SUBTYPE_HISKY "HiSky""HK310" #define TR_SUBTYPE_HISKY "HiSky""HK310"
@ -1196,4 +1196,4 @@
#define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_POWER "TPWR"
#define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_RSSI "TRSS"
#define ZSTR_TX_QUALITY "TQly" #define ZSTR_TX_QUALITY "TQly"
#define ZSTR_TX_SNR "TSNR" #define ZSTR_TX_SNR "TSNR"

View file

@ -104,13 +104,13 @@
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
#define LEN_MULTI_PROTOCOLS "\006" #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 LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #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 LEN_SUBTYPE_HISKY "\005"
#define TR_SUBTYPE_HISKY "HiSky""HK310" #define TR_SUBTYPE_HISKY "HiSky""HK310"
@ -1196,4 +1196,4 @@
#define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_POWER "TPWR"
#define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_RSSI "TRSS"
#define ZSTR_TX_QUALITY "TQly" #define ZSTR_TX_QUALITY "TQly"
#define ZSTR_TX_SNR "TSNR" #define ZSTR_TX_SNR "TSNR"

View file

@ -104,13 +104,13 @@
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
#define LEN_MULTI_PROTOCOLS "\006" #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 LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #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 LEN_SUBTYPE_HISKY "\005"
#define TR_SUBTYPE_HISKY "HiSky""HK310" #define TR_SUBTYPE_HISKY "HiSky""HK310"
@ -1223,4 +1223,4 @@
#define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_POWER "TPWR"
#define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_RSSI "TRSS"
#define ZSTR_TX_QUALITY "TQly" #define ZSTR_TX_QUALITY "TQly"
#define ZSTR_TX_SNR "TSNR" #define ZSTR_TX_SNR "TSNR"

View file

@ -104,13 +104,13 @@
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
#define LEN_MULTI_PROTOCOLS "\006" #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 LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #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 LEN_SUBTYPE_HISKY "\005"
#define TR_SUBTYPE_HISKY "HiSky""HK310" #define TR_SUBTYPE_HISKY "HiSky""HK310"
@ -1232,4 +1232,4 @@
#define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_POWER "TPWR"
#define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_RSSI "TRSS"
#define ZSTR_TX_QUALITY "TQly" #define ZSTR_TX_QUALITY "TQly"
#define ZSTR_TX_SNR "TSNR" #define ZSTR_TX_SNR "TSNR"

View file

@ -105,13 +105,13 @@
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
#define LEN_MULTI_PROTOCOLS "\006" #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 LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #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 LEN_SUBTYPE_HISKY "\005"
#define TR_SUBTYPE_HISKY "HiSky""HK310" #define TR_SUBTYPE_HISKY "HiSky""HK310"
@ -1247,4 +1247,4 @@
#define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_POWER "TPWR"
#define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_RSSI "TRSS"
#define ZSTR_TX_QUALITY "TQly" #define ZSTR_TX_QUALITY "TQly"
#define ZSTR_TX_SNR "TSNR" #define ZSTR_TX_SNR "TSNR"

View file

@ -96,7 +96,7 @@
#define TR_COUNTRYCODES TR("US""JP""EU", "Ameryka""Japonia""Europa\0") #define TR_COUNTRYCODES TR("US""JP""EU", "Ameryka""Japonia""Europa\0")
#define LEN_TARANIS_PROTOCOLS "\004" #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 LEN_XJT_PROTOCOLS "\004"
#define TR_XJT_PROTOCOLS "OFF\0""D16\0""D8\0 ""LR12" #define TR_XJT_PROTOCOLS "OFF\0""D16\0""D8\0 ""LR12"
@ -104,6 +104,44 @@
#define LEN_DSM_PROTOCOLS "\004" #define LEN_DSM_PROTOCOLS "\004"
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #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 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 ") #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 #else
#define TR_RXNUM "NumOdb" #define TR_RXNUM "NumOdb"
#endif #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_SYNCMENU "[Synch]"
#define TR_LIMIT INDENT "Limit" #define TR_LIMIT INDENT "Limit"
#define TR_MINRSSI "Min Rssi" #define TR_MINRSSI "Min Rssi"
@ -1190,4 +1234,4 @@
#define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_POWER "TPWR"
#define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_RSSI "TRSS"
#define ZSTR_TX_QUALITY "TQly" #define ZSTR_TX_QUALITY "TQly"
#define ZSTR_TX_SNR "TSNR" #define ZSTR_TX_SNR "TSNR"

View file

@ -104,12 +104,14 @@
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
#define LEN_MULTI_PROTOCOLS "\006" #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 LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #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 LEN_SUBTYPE_HISKY "\005"
#define TR_SUBTYPE_HISKY "HiSky""HK310" #define TR_SUBTYPE_HISKY "HiSky""HK310"
@ -1190,4 +1192,4 @@
#define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_POWER "TPWR"
#define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_RSSI "TRSS"
#define ZSTR_TX_QUALITY "TQly" #define ZSTR_TX_QUALITY "TQly"
#define ZSTR_TX_SNR "TSNR" #define ZSTR_TX_SNR "TSNR"

View file

@ -104,12 +104,13 @@
#define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX"
#define LEN_MULTI_PROTOCOLS "\006" #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 LEN_SUBTYPE_FLYSKY "\004"
#define TR_SUBTYPE_FLYSKY "Std\0""V9x9""V6x6""V912" #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 LEN_SUBTYPE_HISKY "\005"
#define TR_SUBTYPE_HISKY "HiSky""HK310" #define TR_SUBTYPE_HISKY "HiSky""HK310"
@ -1247,4 +1248,4 @@
#define ZSTR_TX_POWER "TPWR" #define ZSTR_TX_POWER "TPWR"
#define ZSTR_TX_RSSI "TRSS" #define ZSTR_TX_RSSI "TRSS"
#define ZSTR_TX_QUALITY "TQly" #define ZSTR_TX_QUALITY "TQly"
#define ZSTR_TX_SNR "TSNR" #define ZSTR_TX_SNR "TSNR"