Another small multi protocol update, add H26WH mjxq subprotocol and telmetry as option for Bayang (#4244)

This commit is contained in:
Arne Schwabe
2017-01-16 18:58:43 +01:00
committed by Bertrand Songis
parent 19213c8013
commit e0113e9bb9
14 changed files with 26 additions and 13 deletions
+2 -2
View File
@@ -608,9 +608,9 @@ const mm_protocol_definition multi_protocols[] = {
{ MM_RF_PROTO_SLT, STR_SUBTYPE_SLT, 1, nullptr },
{ MM_RF_PROTO_CX10, STR_SUBTYPE_CX10, 7, nullptr },
{ MM_RF_PROTO_CG023, STR_SUBTYPE_CG023, 2, nullptr },
{ MM_RF_PROTO_BAYANG, STR_SUBTYPE_BAYANG, 1, nullptr },
{ MM_RF_PROTO_BAYANG, STR_SUBTYPE_BAYANG, 1, STR_MULTI_TELEMETRY },
{ MM_RF_PROTO_MT99XX, STR_SUBTYPE_MT99, 4, nullptr },
{ MM_RF_PROTO_MJXQ, STR_SUBTYPE_MJXQ, 4, nullptr },
{ MM_RF_PROTO_MJXQ, STR_SUBTYPE_MJXQ, 5, nullptr },
{ MM_RF_PROTO_FY326, STR_SUBTYPE_FY326, 1, nullptr },
{ MM_RF_PROTO_SFHSS, nullptr, 0, STR_MULTI_RFTUNE },
{ MM_RF_PROTO_HONTAI, STR_SUBTYPE_HONTAI, 3, nullptr },
+1
View File
@@ -475,6 +475,7 @@ const pm_char STR_MONITOR_SCREENS[] PROGMEM = TR_MONITOR_SCREENS;
#if defined(MULTIMODULE)
const pm_char STR_MULTI_CUSTOM[] PROGMEM = TR_MULTI_CUSTOM;
const pm_char STR_MULTI_RFTUNE[] PROGMEM = TR_MULTI_RFTUNE;
const pm_char STR_MULTI_TELEMETRY[] PROGMEM = TR_MULTI_TELEMETRY;
const pm_char STR_MULTI_VIDFREQ[] PROGMEM = TR_MULTI_VIDFREQ;
const pm_char STR_MULTI_RFPOWER[] PROGMEM = TR_MULTI_RFPOWER;
const pm_char STR_MULTI_OPTION[] PROGMEM = TR_MULTI_OPTION;
+1
View File
@@ -614,6 +614,7 @@ extern const pm_char STR_MULTI_OPTION[];
extern const pm_char STR_MULTI_VIDFREQ[];
extern const pm_char STR_MULTI_RFPOWER[];
extern const pm_char STR_MULTI_RFTUNE[];
extern const pm_char STR_MULTI_TELEMETRY[];
extern const pm_char STR_MULTI_AUTOBIND[];
extern const pm_char STR_MULTI_DSM_AUTODTECT[];
extern const pm_char STR_MULTI_LOWPOWER[];
+2 -1
View File
@@ -148,7 +148,7 @@
#define TR_SUBTYPE_MT99 "MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805"
#define LEN_SUBTYPE_MJXQ "\005"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0""H26WH"
#define LEN_SUBTYPE_HONTAI "\007"
#define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln"
@@ -914,6 +914,7 @@
#define TR_RECEIVER_NUM "RX číslo"
#endif
#define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune")
#define TR_MULTI_TELEMETRY "Telemetry"
#define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency")
#define TR_MULTI_RFPOWER INDENT "RF Power"
#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value")
+2 -1
View File
@@ -153,7 +153,7 @@
#define TR_SUBTYPE_MT99 "MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805"
#define LEN_SUBTYPE_MJXQ "\005"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0""H26WH"
#define LEN_SUBTYPE_HONTAI "\007"
#define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln"
@@ -914,6 +914,7 @@
#define TR_RECEIVER "Empf Nr."
#endif
#define TR_MULTI_RFTUNE TR(INDENT "RF Freq.", INDENT "RF Freq. Feintuning")
#define TR_MULTI_TELEMETRY "Telemetry"
#define TR_MULTI_VIDFREQ TR(INDENT "Vid. Freq.", INDENT "Video Frequenz")
#define TR_MULTI_RFPOWER INDENT "RF Power"
#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Optionswert")
+2 -1
View File
@@ -152,7 +152,7 @@
#define TR_SUBTYPE_MT99 "MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805"
#define LEN_SUBTYPE_MJXQ "\005"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0""H26WH"
#define LEN_SUBTYPE_HONTAI "\007"
#define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln"
@@ -889,6 +889,7 @@
#define TR_RECEIVER "RxNum"
#endif
#define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune")
#define TR_MULTI_TELEMETRY "Telemetry"
#define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency")
#define TR_MULTI_RFPOWER INDENT "RF Power"
#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value")
+2 -1
View File
@@ -148,7 +148,7 @@
#define TR_SUBTYPE_MT99 "MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805"
#define LEN_SUBTYPE_MJXQ "\005"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0""H26WH"
#define LEN_SUBTYPE_HONTAI "\007"
#define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln"
@@ -862,6 +862,7 @@
#define TR_RECEIVER_NUM TR("RxNum", INDENT"Receptor No.")
#define TR_RECEIVER INDENT "Receiver"
#define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune")
#define TR_MULTI_TELEMETRY "Telemetry"
#define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency")
#define TR_MULTI_RFPOWER INDENT "RF Power"
#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value")
+2 -1
View File
@@ -148,7 +148,7 @@
#define TR_SUBTYPE_MT99 "MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805"
#define LEN_SUBTYPE_MJXQ "\005"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0""H26WH"
#define LEN_SUBTYPE_HONTAI "\007"
#define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln"
@@ -862,6 +862,7 @@
#define TR_RECEIVER_NUM TR("RxNum", INDENT"Receiver No.")
#define TR_RECEIVER INDENT "Receiver"
#define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune")
#define TR_MULTI_TELEMETRY "Telemetry"
#define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency")
#define TR_MULTI_RFPOWER INDENT "RF Power"
#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value")
+2 -1
View File
@@ -148,7 +148,7 @@
#define TR_SUBTYPE_MT99 "MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805"
#define LEN_SUBTYPE_MJXQ "\005"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0""H26WH"
#define LEN_SUBTYPE_HONTAI "\007"
#define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln"
@@ -896,6 +896,7 @@
#define TR_RECEIVER "Récepteur"
#endif
#define TR_MULTI_RFTUNE TR(INDENT "Ajust.fréq", INDENT "Ajustement fréq.")
#define TR_MULTI_TELEMETRY "Telemetry"
#define TR_MULTI_VIDFREQ TR(INDENT "Fréq. vidéo", INDENT "Fréquence vidéo")
#define TR_MULTI_RFPOWER TR(INDENT "Puiss. RF", INDENT "Puissance RF")
#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option perso")
+2 -1
View File
@@ -148,7 +148,7 @@
#define TR_SUBTYPE_MT99 "MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805"
#define LEN_SUBTYPE_MJXQ "\005"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0""H26WH"
#define LEN_SUBTYPE_HONTAI "\007"
#define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln"
@@ -897,6 +897,7 @@
#define TR_RECEIVER_NUM "RxNum"
#endif
#define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune")
#define TR_MULTI_TELEMETRY "Telemetry"
#define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency")
#define TR_MULTI_RFPOWER INDENT "RF Power"
#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value")
+2 -1
View File
@@ -153,7 +153,7 @@
#define TR_SUBTYPE_MT99 "MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805"
#define LEN_SUBTYPE_MJXQ "\005"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0""H26WH"
#define LEN_SUBTYPE_HONTAI "\007"
#define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln"
@@ -891,6 +891,7 @@
#define TR_RECEIVER "RxNum"
#endif
#define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune")
#define TR_MULTI_TELEMETRY "Telemetry"
#define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency")
#define TR_MULTI_RFPOWER INDENT "RF Power"
#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value")
+2 -1
View File
@@ -149,7 +149,7 @@
#define TR_SUBTYPE_MT99 "MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805"
#define LEN_SUBTYPE_MJXQ "\005"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0""H26WH"
#define LEN_SUBTYPE_HONTAI "\007"
#define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln"
@@ -899,6 +899,7 @@
#define TR_RECEIVER_NUM "NumOdb"
#endif
#define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune")
#define TR_MULTI_TELEMETRY "Telemetry"
#define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency")
#define TR_MULTI_RFPOWER INDENT "RF Power"
#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value")
+2 -1
View File
@@ -149,7 +149,7 @@
#define TR_SUBTYPE_MT99 "MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805"
#define LEN_SUBTYPE_MJXQ "\005"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0""H26WH"
#define LEN_SUBTYPE_HONTAI "\007"
#define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln"
@@ -858,6 +858,7 @@
#define TR_RECEIVER INDENT "Receiver"
#define TR_SYNCMENU "Sync [MENU]"
#define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune")
#define TR_MULTI_TELEMETRY "Telemetry"
#define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency")
#define TR_MULTI_RFPOWER INDENT "RF Power"
#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value")
+2 -1
View File
@@ -148,7 +148,7 @@
#define TR_SUBTYPE_MT99 "MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805"
#define LEN_SUBTYPE_MJXQ "\005"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0"
#define TR_SUBTYPE_MJXQ "WLH08""X600\0""X800\0""H26D\0""E010\0""H26WH"
#define LEN_SUBTYPE_HONTAI "\007"
#define TR_SUBTYPE_HONTAI "Std\0 ""JJRC X1""X5C1cln"
@@ -911,6 +911,7 @@
#endif
#define TR_SYNCMENU "Synk [MENU]"
#define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune")
#define TR_MULTI_TELEMETRY "Telemetry"
#define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency")
#define TR_MULTI_RFPOWER INDENT "RF Power"
#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value")