diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 570e802f4..ba3f97720 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -1104,7 +1104,6 @@ void addOpenTxTaranisOptions(OpenTxFirmware * firmware) { addOpenTxFrskyOptions(firmware); firmware->addOption("sqt5font", QCoreApplication::translate("Firmware", "Use alternative SQT5 font")); - firmware->addOption("noras", QCoreApplication::translate("Firmware", "Disable RAS (SWR)")); } void addOpenTxLcdOptions(OpenTxFirmware * firmware) @@ -1168,6 +1167,7 @@ void registerOpenTxFirmwares() /* FrSky Taranis X9D+ board */ firmware = new OpenTxFirmware("opentx-x9d+", QCoreApplication::translate("Firmware", "FrSky Taranis X9D+"), BOARD_TARANIS_X9DP); firmware->addOption("internalppm", QCoreApplication::translate("Firmware", "Support for PPM internal module hack")); + firmware->addOption("noras", QCoreApplication::translate("Firmware", "Disable RAS (SWR)")); addOpenTxTaranisOptions(firmware); registerOpenTxFirmware(firmware); @@ -1193,6 +1193,7 @@ void registerOpenTxFirmwares() /* FrSky X-Lite board */ firmware = new OpenTxFirmware("opentx-xlite", QCoreApplication::translate("Firmware", "FrSky Taranis X-Lite"), BOARD_TARANIS_XLITE); + firmware->addOption("stdr9m", QCoreApplication::translate("Firmware", "Use full size R9M module")); addOpenTxTaranisOptions(firmware); registerOpenTxFirmware(firmware); diff --git a/radio/util/build-firmware.py b/radio/util/build-firmware.py index 477fde2fd..e6528f692 100755 --- a/radio/util/build-firmware.py +++ b/radio/util/build-firmware.py @@ -108,7 +108,7 @@ elif options[optcount] == "x7": board_family = BOARD_FAMILY_ARM elif options[optcount] == "xlite": command_options["PCB"] = "XLITE" - firmware_options = options_taranisplus + firmware_options = options_xlite maxsize = 65536 * 8 board = BOARD_TARANIS board_family = BOARD_FAMILY_ARM diff --git a/radio/util/fwoptions.py b/radio/util/fwoptions.py index ccda2dd82..ffd92f3f3 100755 --- a/radio/util/fwoptions.py +++ b/radio/util/fwoptions.py @@ -239,7 +239,6 @@ options_taranis = { "haptic": ("HAPTIC", "YES", "NO"), "nogvars": ("GVARS", "NO", "YES"), "sqt5font": ("FONT", "SQT5", None), - "noras": ("RAS", "NO", "YES"), "faimode": ("FAI", "YES", None), "faichoice": ("FAI", "CHOICE", None), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), @@ -266,6 +265,22 @@ options_taranisplus = { "multimodule": ("MULTIMODULE", "YES", "NO") } +options_xlite = { + "noheli": ("HELI", "NO", "YES"), + "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"), + "lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"), + "luac": ("LUA_COMPILER", "YES", "NO"), + "nogvars": ("GVARS", "NO", "YES"), + "sqt5font": ("FONT", "SQT5", None), + "faimode": ("FAI", "YES", None), + "faichoice": ("FAI", "CHOICE", None), + "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), + "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), + "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), + "multimodule": ("MULTIMODULE", "YES", "NO"), + "stdr9m": ("MODULE_R9M_FULLSIZE", "YES", None) +} + options_taranisx9e = { "noheli": ("HELI", "NO", "YES"), "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"), @@ -273,7 +288,6 @@ options_taranisx9e = { "luac": ("LUA_COMPILER", "YES", "NO"), "nogvars": ("GVARS", "NO", "YES"), "sqt5font": ("FONT", "SQT5", None), - "noras": ("RAS", "NO", "YES"), "faimode": ("FAI", "YES", None), "faichoice": ("FAI", "CHOICE", None), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),