Merge with latest 2.3
This commit is contained in:
@@ -151,7 +151,7 @@ def main():
|
||||
elif board_name == "tx16s":
|
||||
cmake_options["PCB"] = "X10"
|
||||
cmake_options["PCBREV"] = "TX16S"
|
||||
firmware_options = options_jumper_t16
|
||||
firmware_options = options_radiomaster_tx16s
|
||||
maxsize = 2 * 1024 * 1024
|
||||
else:
|
||||
return INVALID_BOARD
|
||||
|
||||
@@ -222,4 +222,17 @@ options_jumper_t16 = {
|
||||
"flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
|
||||
"internalmulti": ("INTERNAL_MODULE_MULTI", "YES", "NO"),
|
||||
"bluetooth": ("BLUETOOTH", "YES", "NO"),
|
||||
}
|
||||
|
||||
options_radiomaster_tx16s = {
|
||||
"noheli": ("HELI", "NO", "YES"),
|
||||
"ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"),
|
||||
"lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"),
|
||||
"nogvars": ("GVARS", "NO", "YES"),
|
||||
"faimode": ("FAI", "YES", None),
|
||||
"faichoice": ("FAI", "CHOICE", None),
|
||||
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
|
||||
"flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
|
||||
"bluetooth": ("BLUETOOTH", "YES", "NO"),
|
||||
"internalgps": ("INTERNAL_GPS", "YES", "NO"),
|
||||
}
|
||||
@@ -72,7 +72,9 @@ for s, f in [("trim center", "midtrim"),
|
||||
("receiver still connected", "modelpwr"),
|
||||
]:
|
||||
systemSounds.append((s, filename(f)))
|
||||
for i, (s, f) in enumerate([("gear!, up!", "gearup"),
|
||||
for i, (s, f) in enumerate([("armed", "armed"),
|
||||
("disarmed", "disarm"),
|
||||
("gear!, up!", "gearup"),
|
||||
("gear!, down!", "geardn"),
|
||||
("flaps!, up!", "flapup"),
|
||||
("flaps!, down!", "flapdn"),
|
||||
|
||||
@@ -71,9 +71,11 @@ for s, f in [("Trim centré", "midtrim"),
|
||||
("Récepteur encore sous tension", "modelpwr"),
|
||||
]:
|
||||
systemSounds.append((s, filename(f)))
|
||||
for i, (s, f) in enumerate([("altitude", "altitude"),
|
||||
for i, (s, f) in enumerate([("armé", "armed"),
|
||||
("désarmé", "disarm"),
|
||||
("altitude", "alt"),
|
||||
("température moteur", "moteur"),
|
||||
("température contrôleur", "cntrleur"),
|
||||
("température contrôleur", "tctrl"),
|
||||
("train rentré", "gearup"),
|
||||
("train sorti", "geardn"),
|
||||
("volets rentrés", "flapup"),
|
||||
|
||||
@@ -14,9 +14,9 @@ systemSounds.append(("mila", filename(101)))
|
||||
systemSounds.append(("mille", filename(102)))
|
||||
for i, s in enumerate(["virgola", "un", "e", "meno", "ora", "ore", "minuto", "minuti", "secondo", "secondi"]):
|
||||
systemSounds.append((s, filename(103 + i)))
|
||||
for i, (s, f) in enumerate([("volt", "volt0"),
|
||||
("ampere", "amp0"),
|
||||
("milliampere", "mamp0"),
|
||||
for i, (s, f) in enumerate([("volt", "volt0"),("volt", "volt1"),
|
||||
("ampere", "amp0"),("ampere", "amp1"),
|
||||
("milliampere", "mamp0"),("milliampere", "mamp1"),
|
||||
("nodo", "knot0"), ("nodi", "knot1"),
|
||||
("metri al secondo", "mps0"), ("metri al secondo", "msp1"),
|
||||
("piedi al secondo", "fps0"), ("piedi al secondo", "fps1"),
|
||||
|
||||
Reference in New Issue
Block a user