Skip to content

Commit efc3d0d

Browse files
pfeerickpfeerick
committed
chore: refresh MPM defs to 1.3.4.31
1 parent 9661044 commit efc3d0d

File tree

2 files changed

+60
-41
lines changed

2 files changed

+60
-41
lines changed

‎radio/src/MultiProtoDefs.h‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121

2222
//
23-
// Data based on MPM firmware version 1.3.3.33 multi.txt
23+
// Data based on MPM firmware version 1.3.4.31 multi.txt
2424
//
2525

2626
#if defined(MULTIMODULE) or defined(SIMU)
@@ -92,7 +92,7 @@ enum ModuleSubtypeMulti {
9292
MODULE_SUBTYPE_MULTI_FX,
9393
MODULE_SUBTYPE_MULTI_BAYANG_RX,
9494
MODULE_SUBTYPE_MULTI_PELIKAN,
95-
MODULE_SUBTYPE_MULTI_TIGER, //60
95+
MODULE_SUBTYPE_MULTI_EAZYRC, //60
9696
MODULE_SUBTYPE_MULTI_XK,
9797
MODULE_SUBTYPE_MULTI_XN297DUMP,
9898
MODULE_SUBTYPE_MULTI_FRSKYX2,
@@ -126,6 +126,14 @@ enum ModuleSubtypeMulti {
126126
MODULE_SUBTYPE_MULTI_MT99XX2,
127127
MODULE_SUBTYPE_MULTI_KYOSHO2,
128128
MODULE_SUBTYPE_MULTI_SCORPIO,
129+
MODULE_SUBTYPE_MULTI_BLUEFLY,
130+
MODULE_SUBTYPE_MULTI_BUMBLEB, //95
131+
MODULE_SUBTYPE_MULTI_SGF22,
132+
MODULE_SUBTYPE_MULTI_KYOSHO3,
133+
MODULE_SUBTYPE_MULTI_XK2,
134+
MODULE_SUBTYPE_MULTI_YUXIANG,
135+
MODULE_SUBTYPE_MULTI_JIABAILE, //100
136+
MODULE_SUBTYPE_MULTI_H36,
129137
//
130138
// spare entries - don't touch,
131139
// just add to known protocols
@@ -161,10 +169,11 @@ enum ModuleSubtypeMulti {
161169
"Q303","GW008","DM002","Cabell","Esky150","H8 3D","Corona","CFlie","Hitec","WFLY",\
162170
"Bugs","BugMini","Traxxas","NCC1701","E01X","V911S","GD00X","V761","KF606","Redpine",\
163171
"Potensi","ZSX","Height","Scanner","FrSkyRX","FS2A_RX","HoTT","FX","BayanRX","Pelikan",\
164-
"Tiger", "XK","XN297DU","FrSkyX2","FrSkyR9","Propel","FrSky L","Skyartc","ESkyV2","DSM_RX",\
172+
"EazyRC", "XK","XN297DU","FrSkyX2","FrSkyR9","Propel","FrSky L","Skyartc","ESkyV2","DSM_RX",\
165173
"JJRC345","Q90C","Kyosho","RadLink","ExpLRS","Realacc","OMP","M-Link","WFLY2","E016Hv2",\
166174
"E010r5","LOLI","E129","JOYSWAY","E016H","Config","IKEA","WILLIFM","Losi","MouldKg",\
167-
"Xerall","MT99XX2", "Kyosho2", "Scorpio"
175+
"Xerall","MT99XX2","Kyosho2","Scorpio","BlueFly","BumbleB","SGF22","Kyosho3","XK2", \
176+
"Yuxiang","Jiabaile","H36"
168177
#define SPARE_PROTO_NAMES \
169178
"NN 1","NN 2","NN 3","NN 4","NN 5","NN 6","NN 7","NN 8","NN 9","NN 10"
170179
#define SPARE_SUBTYPE_NAMES \

‎radio/src/MultiSubtypeDefs.h‎

Lines changed: 47 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121

2222
//
23-
// Data based on MPM firmware version 1.3.3.33 multi.txt
23+
// Data based on MPM firmware version 1.3.4.31 multi.txt
2424
//
2525

2626
#if defined(MULTIMODULE) or defined(SIMU)
@@ -95,12 +95,12 @@ STRLIST(STR_SUBTYPE_FRSKYD, {"D8","Cloned"})
9595
STRLIST(STR_SUBTYPE_FRSKYX, {"D16","D16 8ch","LBT(EU)","LBT 8ch","Cloned", "Cloned 8ch"})
9696
STRLIST(STR_SUBTYPE_HISKY, {"Std","HK310"})
9797
STRLIST(STR_SUBTYPE_V2X2, {"Std","JXD506","MR101"})
98-
STRLIST(STR_SUBTYPE_DSM, {"2 1F","2 2F","X 1F","X 2F","Auto","R 1F"})
98+
STRLIST(STR_SUBTYPE_DSM, {"2 1F","2 2F","X 1F","X 2F","Auto","R 1F","R","SFC"})
9999
STRLIST(STR_SUBTYPE_DEVO, {"8ch","10ch","12ch","6ch","7ch"})
100100
STRLIST(STR_SUBTYPE_YD717, {"Std","SkyWlkr","Syma X4","XINXUN","NIHUI"})
101101
STRLIST(STR_SUBTYPE_KN, {"WLtoys","FeiLun"})
102102
STRLIST(STR_SUBTYPE_SYMAX, {"Std","X5C"})
103-
STRLIST(STR_SUBTYPE_SLT, {"V1_6ch","V2_8ch","Q100","Q200","MR100"})
103+
STRLIST(STR_SUBTYPE_SLT, {"V1_6ch","V2_8ch","Q100","Q200","MR100","V1_4ch","RF Sim"})
104104
STRLIST(STR_SUBTYPE_CX10, {"Green","Blue","DM007","-","JC3015a","JC3015b","MK33041"})
105105
STRLIST(STR_SUBTYPE_CG023, {"Std","YD829"})
106106
STRLIST(STR_SUBTYPE_BAYANG, {"Std","H8S3D","X16 AH","IRDrone","DHD D4","QX100"})
@@ -109,7 +109,7 @@ STRLIST(STR_SUBTYPE_MT99, {"MT99","H7","YZ","LS","FY805","A180","Dragon","F
109109
STRLIST(STR_SUBTYPE_MJXQ, {"WLH08","X600","X800","H26D","E010","H26WH","Phoenix"})
110110
STRLIST(STR_SUBTYPE_FY326, {"Std","FY319"})
111111
STRLIST(STR_SUBTYPE_FUTABA, {"SFHSS"})
112-
STRLIST(STR_SUBTYPE_HONTAI, {"Std","JJRC X1","X5C1","FQ_951"})
112+
STRLIST(STR_SUBTYPE_HONTAI, {"Std","JJRC X1","X5C1","FQ_951","XKK170"})
113113
STRLIST(STR_SUBTYPE_AFHDS2A, {"PWM,IBUS","PPM,IBUS","PWM,SBUS","PPM,SBUS","PWM,IB16","PPM,IB16","PWM,SB16","PPM,SB16"})
114114
STRLIST(STR_SUBTYPE_Q2X2, {"Q222","Q242","Q282"})
115115
STRLIST(STR_SUBTYPE_WK2x01, {"WK2801","WK2401","W6_5_1","W6_6_1","W6_HeL","W6_HeI"})
@@ -121,7 +121,7 @@ STRLIST(STR_SUBTYPE_CORONA, {"V1","V2","FD V3"})
121121
STRLIST(STR_SUBTYPE_HITEC, {"Optima","Opt Hub","Minima"})
122122
STRLIST(STR_SUBTYPE_WFLY, {"WFR0x"})
123123
STRLIST(STR_SUBTYPE_BUGS_MINI, {"Std","Bugs3H"})
124-
STRLIST(STR_SUBTYPE_TRAXXAS, {"6519"})
124+
STRLIST(STR_SUBTYPE_TRAXXAS, {"TQ"})
125125
STRLIST(STR_SUBTYPE_E01X, {"E012","E015"})
126126
STRLIST(STR_SUBTYPE_V911S, {"Std","E119"})
127127
STRLIST(STR_SUBTYPE_GD00X, {"GD_V1","GD_V2"})
@@ -133,9 +133,9 @@ STRLIST(STR_SUBTYPE_ZSX, {"280JJRC"})
133133
STRLIST(STR_SUBTYPE_HEIGHT, {"5ch","8ch"})
134134
STRLIST(STR_SUBTYPE_FRSKYX_RX, {"Multi","CloneTX","EraseTX","CPPM"})
135135
STRLIST(STR_SUBTYPE_HOTT, {"Sync","No_Sync"})
136-
STRLIST(STR_SUBTYPE_FX, {"816","620","9630"})
136+
STRLIST(STR_SUBTYPE_FX, {"816","620","9630","Q560"})
137137
STRLIST(STR_SUBTYPE_PELIKAN, {"Pro","Lite","SCX24"})
138-
STRLIST(STR_SUBTYPE_XK, {"X450","X420"})
138+
STRLIST(STR_SUBTYPE_XK, {"X450","X420","Cars"})
139139
STRLIST(STR_SUBTYPE_XN297DUMP, {"250K","1M","2M","AUTO","NRF","CC2500"})
140140
STRLIST(STR_SUBTYPE_FRSKYR9, {"915MHz","868MHz","915 8ch","868 8ch","FCC","--","FCC 8ch","-- 8ch"})
141141
STRLIST(STR_SUBTYPE_PROPEL, {"74-Z"})
@@ -144,15 +144,17 @@ STRLIST(STR_SUBTYPE_ESKY150V2, {"150 V2"})
144144
STRLIST(STR_SUBTYPE_JJRC345, {"Std","SkyTmbr"})
145145
STRLIST(STR_SUBTYPE_KYOSHO, {"FHSS","Hype"})
146146
STRLIST(STR_SUBTYPE_KYOSHO2, {"KT-17"})
147-
STRLIST(STR_SUBTYPE_RLINK, {"Surface","Air","DumboRC"})
147+
STRLIST(STR_SUBTYPE_RLINK, {"Surface","Air","DumboRC","RC4G"})
148148
STRLIST(STR_SUBTYPE_ELRS, {"N/A WIP"})
149-
STRLIST(STR_SUBTYPE_REALACC, {"R11"})
150149
STRLIST(STR_SUBTYPE_WFLY2, {"RF20x"})
151150
STRLIST(STR_SUBTYPE_MOULDKG, {"Analog","Digital"})
152-
STRLIST(STR_SUBTYPE_MT992, {"PA18"})
151+
STRLIST(STR_SUBTYPE_MT992, {"PA18","SU35"})
153152
STRLIST(STR_SUBTYPE_RX, {"Multi","CPPM"})
154153
STRLIST(STR_SUBTYPE_DSM_RX, {"Multi","CloneTX","EraseTX","CPPM"})
155154
STRLIST(STR_SUBTYPE_E129, {"STD","C186"})
155+
STRLIST(STR_SUBTYPE_SGF22, {"F22","F22S","J20"})
156+
STRLIST(STR_SUBTYPE_XK2, {"X4","P10"})
157+
STRLIST(STR_SUBTYPE_JIABAILE, {"STD","GYRO"})
156158

157159
//
158160
// Generic subtypes for future use protocols - don't touch
@@ -161,7 +163,7 @@ STRLIST(STR_SUBTYPE_NN, { SPARE_SUBTYPE_NAMES })
161163

162164
//
163165
// Common data structure defining Multi protocol capabilites, i.e. number of subtypes,
164-
// failsafe support yes/no, channel map disabled yes/no, reference to the suptype options strings above
166+
// failsafe support yes/no, channel map disabled yes/no, reference to the subtype options strings above
165167
// and further protocol options, e.g. RF tune, video frequency.
166168
//
167169
PROTODEF ({
@@ -170,45 +172,45 @@ PROTODEF ({
170172
{MODULE_SUBTYPE_MULTI_FRSKY, 1, false, false, STR_SUBTYPE_FRSKYD, STR_MULTI_RFTUNE},
171173
{MODULE_SUBTYPE_MULTI_HISKY, 1, true, true, STR_SUBTYPE_HISKY, nullptr},
172174
{MODULE_SUBTYPE_MULTI_V2X2, 2, false, false, STR_SUBTYPE_V2X2, nullptr},
173-
{MODULE_SUBTYPE_MULTI_DSM2, 5, false, true, STR_SUBTYPE_DSM, STR_MULTI_MAX_THROW},
175+
{MODULE_SUBTYPE_MULTI_DSM2, 7, false, true, STR_SUBTYPE_DSM, STR_MULTI_MAX_THROW},
174176
{MODULE_SUBTYPE_MULTI_DEVO, 4, true, true, STR_SUBTYPE_DEVO, STR_MULTI_FIXEDID},
175177
{MODULE_SUBTYPE_MULTI_YD717, 4, false, false, STR_SUBTYPE_YD717, nullptr},
176178
{MODULE_SUBTYPE_MULTI_KN, 1, false, false, STR_SUBTYPE_KN, nullptr},
177179
{MODULE_SUBTYPE_MULTI_SYMAX, 1, false, false, STR_SUBTYPE_SYMAX, nullptr},
178-
{MODULE_SUBTYPE_MULTI_SLT, 4, false, true, STR_SUBTYPE_SLT, STR_MULTI_RFTUNE},
180+
{MODULE_SUBTYPE_MULTI_SLT, 6, false, true, STR_SUBTYPE_SLT, STR_MULTI_RFTUNE},
179181
{MODULE_SUBTYPE_MULTI_CX10, 6, false, false, STR_SUBTYPE_CX10, nullptr},
180182
{MODULE_SUBTYPE_MULTI_CG023, 1, false, false, STR_SUBTYPE_CG023, nullptr},
181183
{MODULE_SUBTYPE_MULTI_BAYANG, 5, false, false, STR_SUBTYPE_BAYANG, STR_MULTI_TELEMETRY},
182184
{MODULE_SUBTYPE_MULTI_FRSKYX, 5, true, false, STR_SUBTYPE_FRSKYX, STR_MULTI_RFTUNE},
183185
{MODULE_SUBTYPE_MULTI_ESky, 1, false, true, STR_SUBTYPE_ESky, nullptr},
184186
{MODULE_SUBTYPE_MULTI_MT99XX, 7, false, false, STR_SUBTYPE_MT99, nullptr},
185187
{MODULE_SUBTYPE_MULTI_MJXQ, 6, false, false, STR_SUBTYPE_MJXQ, nullptr},
186-
{MODULE_SUBTYPE_MULTI_SHENQI, 0, false, false, NO_SUBTYPE, nullptr}, //new
188+
{MODULE_SUBTYPE_MULTI_SHENQI, 0, false, false, NO_SUBTYPE, nullptr},
187189
{MODULE_SUBTYPE_MULTI_FY326, 1, false, false, STR_SUBTYPE_FY326, nullptr},
188190
{MODULE_SUBTYPE_MULTI_FUTABA, 0, true, true, STR_SUBTYPE_FUTABA, STR_MULTI_RFTUNE},
189191
{MODULE_SUBTYPE_MULTI_J6PRO, 0, false, true, NO_SUBTYPE, nullptr},
190-
{MODULE_SUBTYPE_MULTI_FQ777, 0, false, false, NO_SUBTYPE, nullptr}, //new
191-
{MODULE_SUBTYPE_MULTI_ASSAN, 0, false, false, NO_SUBTYPE, nullptr}, //new
192+
{MODULE_SUBTYPE_MULTI_FQ777, 0, false, false, NO_SUBTYPE, nullptr},
193+
{MODULE_SUBTYPE_MULTI_ASSAN, 0, false, false, NO_SUBTYPE, nullptr},
192194
{MODULE_SUBTYPE_MULTI_FRSKYV, 0, false, false, NO_SUBTYPE, STR_MULTI_RFTUNE},
193-
{MODULE_SUBTYPE_MULTI_HONTAI, 3, false, false, STR_SUBTYPE_HONTAI, nullptr},
195+
{MODULE_SUBTYPE_MULTI_HONTAI, 4, false, false, STR_SUBTYPE_HONTAI, nullptr},
194196
// MODULE_SUBTYPE_MULTI_OLRS non selectable and masked out for selection
195197
{MODULE_SUBTYPE_MULTI_FS_AFHDS2A, 7, true, true, STR_SUBTYPE_AFHDS2A, STR_MULTI_SERVOFREQ},
196198
{MODULE_SUBTYPE_MULTI_Q2X2, 2, false, false, STR_SUBTYPE_Q2X2, nullptr},
197199
{MODULE_SUBTYPE_MULTI_WK_2X01, 5, true, true, STR_SUBTYPE_WK2x01, nullptr},
198200
{MODULE_SUBTYPE_MULTI_Q303, 3, false, false, STR_SUBTYPE_Q303, nullptr},
199-
{MODULE_SUBTYPE_MULTI_GW008, 0, false, false, NO_SUBTYPE, nullptr}, //new
200-
{MODULE_SUBTYPE_MULTI_DM002, 0, false, false, NO_SUBTYPE, nullptr}, //new
201+
{MODULE_SUBTYPE_MULTI_GW008, 0, false, false, NO_SUBTYPE, nullptr},
202+
{MODULE_SUBTYPE_MULTI_DM002, 0, false, false, NO_SUBTYPE, nullptr},
201203
{MODULE_SUBTYPE_MULTI_CABELL, 7, false, false, STR_SUBTYPE_CABELL, STR_MULTI_OPTION},
202204
{MODULE_SUBTYPE_MULTI_ESKY150, 1, false, false, STR_SUBTYPE_ESKY150, nullptr},
203205
{MODULE_SUBTYPE_MULTI_H83D, 3, false, false, STR_SUBTYPE_H83D, nullptr},
204206
{MODULE_SUBTYPE_MULTI_CORONA, 2, false, false, STR_SUBTYPE_CORONA, STR_MULTI_RFTUNE},
205207
// MODULE_SUBTYPE_MULTI_CFLIE non selectable and masked out for selection
206208
{MODULE_SUBTYPE_MULTI_HITEC, 2, false, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE},
207209
{MODULE_SUBTYPE_MULTI_WFLY, 0, true, false, STR_SUBTYPE_WFLY, nullptr},
208-
{MODULE_SUBTYPE_MULTI_BUGS, 0, false, false, NO_SUBTYPE, nullptr}, //new
210+
{MODULE_SUBTYPE_MULTI_BUGS, 0, false, false, NO_SUBTYPE, nullptr},
209211
{MODULE_SUBTYPE_MULTI_BUGS_MINI, 1, false, false, STR_SUBTYPE_BUGS_MINI, nullptr},
210212
{MODULE_SUBTYPE_MULTI_TRAXXAS, 0, false, false, STR_SUBTYPE_TRAXXAS, nullptr},
211-
{MODULE_SUBTYPE_MULTI_NCC1701, 0, false, false, NO_SUBTYPE, nullptr}, //new
213+
{MODULE_SUBTYPE_MULTI_NCC1701, 0, false, false, NO_SUBTYPE, nullptr},
212214
{MODULE_SUBTYPE_MULTI_E01X, 1, false, false, STR_SUBTYPE_E01X, nullptr},
213215
{MODULE_SUBTYPE_MULTI_V911S, 1, false, false, STR_SUBTYPE_V911S, STR_MULTI_RFTUNE},
214216
{MODULE_SUBTYPE_MULTI_GD00X, 1, false, false, STR_SUBTYPE_GD00X, STR_MULTI_RFTUNE},
@@ -220,45 +222,53 @@ PROTODEF ({
220222
{MODULE_SUBTYPE_MULTI_HEIGHT, 1, false, false, STR_SUBTYPE_HEIGHT, nullptr},
221223
// MODULE_SUBTYPE_MULTI_SCANNER non selectable and masked out for selection
222224
{MODULE_SUBTYPE_MULTI_FRSKYX_RX, 3, false, false, STR_SUBTYPE_FRSKYX_RX, STR_MULTI_RFTUNE},
223-
{MODULE_SUBTYPE_MULTI_AFHDS2A_RX, 1, false, false, STR_SUBTYPE_RX, nullptr}, //new
225+
{MODULE_SUBTYPE_MULTI_AFHDS2A_RX, 1, false, false, STR_SUBTYPE_RX, nullptr},
224226
{MODULE_SUBTYPE_MULTI_HOTT, 1, true, false, STR_SUBTYPE_HOTT, STR_MULTI_RFTUNE},
225-
{MODULE_SUBTYPE_MULTI_FX, 2, false, false, STR_SUBTYPE_FX, nullptr},
226-
{MODULE_SUBTYPE_MULTI_BAYANG_RX, 1, false, false, STR_SUBTYPE_RX, nullptr}, //new
227+
{MODULE_SUBTYPE_MULTI_FX, 3, false, false, STR_SUBTYPE_FX, nullptr},
228+
{MODULE_SUBTYPE_MULTI_BAYANG_RX, 1, false, false, STR_SUBTYPE_RX, nullptr},
227229
{MODULE_SUBTYPE_MULTI_PELIKAN, 2, false, true, STR_SUBTYPE_PELIKAN, nullptr},
228-
{MODULE_SUBTYPE_MULTI_TIGER, 0, false, false, NO_SUBTYPE, nullptr}, //new
229-
{MODULE_SUBTYPE_MULTI_XK, 1, false, false, STR_SUBTYPE_XK, STR_MULTI_RFTUNE},
230+
{MODULE_SUBTYPE_MULTI_EAZYRC, 0, false, false, NO_SUBTYPE, nullptr},
231+
{MODULE_SUBTYPE_MULTI_XK, 2, false, false, STR_SUBTYPE_XK, STR_MULTI_RFTUNE},
230232
{MODULE_SUBTYPE_MULTI_XN297DUMP, 5, false, false, STR_SUBTYPE_XN297DUMP, STR_MULTI_RFCHAN},
231233
{MODULE_SUBTYPE_MULTI_FRSKYX2, 5, true, false, STR_SUBTYPE_FRSKYX, STR_MULTI_RFTUNE},
232234
{MODULE_SUBTYPE_MULTI_FRSKY_R9, 7, true, false, STR_SUBTYPE_FRSKYR9, nullptr},
233235
{MODULE_SUBTYPE_MULTI_PROPEL, 0, false, false, STR_SUBTYPE_PROPEL, nullptr},
234236
{MODULE_SUBTYPE_MULTI_FRSKYL, 1, false, false, STR_SUBTYPE_FRSKYL, STR_MULTI_RFTUNE},
235237
{MODULE_SUBTYPE_MULTI_SKYARTEC, 0, false, true, NO_SUBTYPE, STR_MULTI_RFTUNE},
236238
{MODULE_SUBTYPE_MULTI_ESKY150V2, 0, false, true, STR_SUBTYPE_ESKY150V2, STR_MULTI_RFTUNE},
237-
{MODULE_SUBTYPE_MULTI_DSM_RX, 3, false, true, STR_SUBTYPE_DSM_RX, nullptr}, //new
239+
{MODULE_SUBTYPE_MULTI_DSM_RX, 3, false, true, STR_SUBTYPE_DSM_RX, nullptr},
238240
{MODULE_SUBTYPE_MULTI_JJRC345, 1, false, false, STR_SUBTYPE_JJRC345, nullptr},
239241
{MODULE_SUBTYPE_MULTI_Q90C, 0, false, false, NO_SUBTYPE, STR_MULTI_RFTUNE},
240242
{MODULE_SUBTYPE_MULTI_KYOSHO, 1, false, true, STR_SUBTYPE_KYOSHO, nullptr},
241-
{MODULE_SUBTYPE_MULTI_RLINK, 2, false, false, STR_SUBTYPE_RLINK, STR_MULTI_RFTUNE},
243+
{MODULE_SUBTYPE_MULTI_RLINK, 3, false, false, STR_SUBTYPE_RLINK, STR_MULTI_RFTUNE},
242244
// MODULE_SUBTYPE_MULTI_ELRS non selectable and masked out for selection
243-
{MODULE_SUBTYPE_MULTI_REALACC, 0, false, false, STR_SUBTYPE_REALACC, nullptr},
245+
{MODULE_SUBTYPE_MULTI_REALACC, 0, false, false, NO_SUBTYPE, nullptr},
244246
{MODULE_SUBTYPE_MULTI_OMP, 0, false, false, NO_SUBTYPE, STR_MULTI_RFTUNE},
245247
{MODULE_SUBTYPE_MULTI_MLINK, 0, true, false, NO_SUBTYPE, nullptr},
246248
{MODULE_SUBTYPE_MULTI_WFLY2, 0, true, false, STR_SUBTYPE_WFLY2, STR_MULTI_OPTION},
247249
{MODULE_SUBTYPE_MULTI_E016HV2, 0, false, false, NO_SUBTYPE, STR_MULTI_RFTUNE},
248-
{MODULE_SUBTYPE_MULTI_E010R5, 0, false, false, NO_SUBTYPE, nullptr}, //new
250+
{MODULE_SUBTYPE_MULTI_E010R5, 0, false, false, NO_SUBTYPE, nullptr},
249251
{MODULE_SUBTYPE_MULTI_LOLI, 0, true, false, NO_SUBTYPE, nullptr},
250-
{MODULE_SUBTYPE_MULTI_E129, 1, false, false, STR_SUBTYPE_E129, nullptr}, //new
251-
{MODULE_SUBTYPE_MULTI_JOYSWAY, 0, false, false, NO_SUBTYPE, nullptr}, //new
252-
{MODULE_SUBTYPE_MULTI_E016H, 0, false, false, NO_SUBTYPE, nullptr}, //new
252+
{MODULE_SUBTYPE_MULTI_E129, 1, false, false, STR_SUBTYPE_E129, nullptr},
253+
{MODULE_SUBTYPE_MULTI_JOYSWAY, 0, false, false, NO_SUBTYPE, nullptr},
254+
{MODULE_SUBTYPE_MULTI_E016H, 0, false, false, NO_SUBTYPE, nullptr},
253255
// MODULE_SUBTYPE_MULTI_CONFIG non selectable and masked out for selection
254256
// MODULE_SUBTYPE_MULTI_IKEAANSLUTA non selectable and masked out for selection
255257
// MODULE_SUBTYPE_MULTI_WILLIFM non selectable and masked out for selection
256-
{MODULE_SUBTYPE_MULTI_LOSI, 0, false, false, NO_SUBTYPE, nullptr}, //new
258+
{MODULE_SUBTYPE_MULTI_LOSI, 0, false, false, NO_SUBTYPE, nullptr},
257259
{MODULE_SUBTYPE_MULTI_MOULDKG, 1, false, false, STR_SUBTYPE_MOULDKG, STR_MULTI_OPTION},
258-
{MODULE_SUBTYPE_MULTI_XERALL, 0, false, false, NO_SUBTYPE, nullptr}, //new
259-
{MODULE_SUBTYPE_MULTI_MT99XX2, 0, false, false, STR_SUBTYPE_MT992, nullptr},
260+
{MODULE_SUBTYPE_MULTI_XERALL, 0, false, false, NO_SUBTYPE, nullptr},
261+
{MODULE_SUBTYPE_MULTI_MT99XX2, 1, false, false, STR_SUBTYPE_MT992, nullptr},
260262
{MODULE_SUBTYPE_MULTI_KYOSHO2, 0, false, false, STR_SUBTYPE_KYOSHO2, nullptr},
261263
{MODULE_SUBTYPE_MULTI_SCORPIO, 0, false, true, NO_SUBTYPE, nullptr},
264+
{MODULE_SUBTYPE_MULTI_BLUEFLY, 0, false, false, NO_SUBTYPE, nullptr},
265+
{MODULE_SUBTYPE_MULTI_BUMBLEB, 0, false, false, NO_SUBTYPE, nullptr},
266+
{MODULE_SUBTYPE_MULTI_SGF22, 2, false, false, STR_SUBTYPE_SGF22, nullptr},
267+
{MODULE_SUBTYPE_MULTI_KYOSHO3, 0, false, false, NO_SUBTYPE, nullptr},
268+
{MODULE_SUBTYPE_MULTI_XK2, 1, false, false, STR_SUBTYPE_XK2, nullptr},
269+
{MODULE_SUBTYPE_MULTI_YUXIANG, 0, false, false, NO_SUBTYPE, nullptr},
270+
{MODULE_SUBTYPE_MULTI_JIABAILE, 1, false, false, STR_SUBTYPE_JIABAILE, nullptr},
271+
{MODULE_SUBTYPE_MULTI_H36, 0, false, false, NO_SUBTYPE, nullptr},
262272
{MODULE_SUBTYPE_MULTI_NN1, 7, true, true, STR_SUBTYPE_NN, STR_MULTI_OPTION},
263273
{MODULE_SUBTYPE_MULTI_NN2, 7, true, true, STR_SUBTYPE_NN, STR_MULTI_OPTION},
264274
{MODULE_SUBTYPE_MULTI_NN3, 7, true, true, STR_SUBTYPE_NN, STR_MULTI_OPTION},
@@ -278,4 +288,4 @@ PROTODEF ({
278288
{MODULE_SUBTYPE_MULTI_SENTINEL, 0, false, false, NO_SUBTYPE, nullptr},
279289
});
280290

281-
#endif // MULTIMODULE
291+
#endif // MULTIMODULE

0 commit comments

Comments
 (0)