diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 2dacafe0b..d58715375 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -1171,8 +1171,117 @@ void registerOpenTxFirmwares() Option nav_options[] = { { "rotenc", QObject::tr("Rotary Encoder use in menus navigation") }, { "potscroll", QObject::tr("Pots use in menus navigation") }, { NULL } }; Option dsm2_options[] = { { "DSM2", QObject::tr("Support for DSM2 modules"), 0 }, { "DSM2PPM", QObject::tr("Support for DSM2 modules using ppm instead of true serial"), 0 }, { NULL } }; + /* Taranis Plus board */ + firmware = new OpenTxFirmware("opentx-taranisplus", QObject::tr("FrSky Taranis Plus"), BOARD_TARANIS_PLUS); + addOpenTxTaranisOptions(firmware); + addOpenTxCommonOptions(firmware); + firmwares.push_back(firmware); + + /* Taranis board */ + firmware = new OpenTxFirmware("opentx-taranis", QObject::tr("FrSky Taranis"), BOARD_TARANIS); + firmware->addOption("haptic", QObject::tr("Haptic module installed")); + addOpenTxTaranisOptions(firmware); + addOpenTxCommonOptions(firmware); + firmwares.push_back(firmware); + + /* Taranis X9E board */ + firmware = new OpenTxFirmware("opentx-taranisx9e", QObject::tr("FrSky Taranis X9E"), BOARD_TARANIS_X9E); + firmware->addOption("shutdownconfirm", QObject::tr("Confirmation before radio shutdown")); + addOpenTxTaranisOptions(firmware); + addOpenTxCommonOptions(firmware); + firmwares.push_back(firmware); + + /* Horus board */ + firmware = new OpenTxFirmware("opentx-horus", QObject::tr("FrSky Horus"), BOARD_HORUS); + firmware->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support")); + firmware->addOption("nogvars", QObject::tr("Disable Global variables")); + firmware->addOption("lua", QObject::tr("Support for Lua model scripts")); + addOpenTxCommonOptions(firmware); + firmwares.push_back(firmware); + + /* 9XR-Pro */ + firmware = new OpenTxFirmware("opentx-9xrpro", QObject::tr("Turnigy 9XR-PRO"), BOARD_9XRPRO); + firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support")); + firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); + firmware->addOption("nofp", QObject::tr("No flight modes")); + firmware->addOption("nocurves", QObject::tr("Disable curves menus")); + firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); + firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); + firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); + firmware->addOption("timer3", QObject::tr("Support for a third timer")); + firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); + firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); + firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); + firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); + firmware->addOption("battgraph", QObject::tr("Battery graph")); + firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items")); + firmware->addOption("bluetooth", QObject::tr("Bluetooth interface")); + addOpenTxCommonOptions(firmware); + firmwares.push_back(firmware); + + /* 9XR board with M128 chip */ + firmware = new OpenTxFirmware("opentx-9xr128", QObject::tr("Turnigy 9XR with m128 chip"), BOARD_M128); + firmware->addOptions(extr_options); + firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support")); + firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); + firmware->addOption("nosplash", QObject::tr("No splash screen")); + firmware->addOption("nofp", QObject::tr("No flight modes")); + firmware->addOption("nocurves", QObject::tr("Disable curves menus")); + firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker")); + firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode")); + firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode")); + // NOT TESTED firmware->addOption("PXX", QObject::tr("Support of FrSky PXX protocol")); + firmware->addOption("DSM2", QObject::tr("Support for DSM2 modules")); + firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); + firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); + firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); + firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); + firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); + firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); + firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); + firmware->addOption("battgraph", QObject::tr("Battery graph")); + firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items")); + firmware->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics")); + firmware->addOption("pgbar", QObject::tr("EEprom write Progress bar")); + firmware->addOption("imperial", QObject::tr("Imperial units")); + addOpenTxCommonOptions(firmware); + firmwares.push_back(firmware); + + /* 9XR board */ + firmware = new OpenTxFirmware("opentx-9xr", QObject::tr("Turnigy 9XR"), BOARD_STOCK); + firmware->addOptions(extr_options); + firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support")); + firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); + firmware->addOption("nosplash", QObject::tr("No splash screen")); + firmware->addOption("nofp", QObject::tr("No flight modes")); + firmware->addOption("nocurves", QObject::tr("Disable curves menus")); + firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker")); + firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode")); + firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode")); + // NOT TESTED firmware->addOption("PXX", QObject::tr("Support of FrSky PXX protocol")); + firmware->addOption("DSM2", QObject::tr("Support for DSM2 modules")); + firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); + firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); + firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); + firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); + firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); + firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); + firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); + firmware->addOption("battgraph", QObject::tr("Battery graph")); + firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items")); + firmware->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics")); + firmware->addOption("pgbar", QObject::tr("EEprom write Progress bar")); + firmware->addOption("imperial", QObject::tr("Imperial units")); + firmware->addOption("nowshh", QObject::tr("No Winged Shadow How High support")); + firmware->addOption("novario", QObject::tr("No vario support")); + firmware->addOption("nogps", QObject::tr("No GPS support")); + firmware->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen")); + firmware->addOption("stickrev", QObject::tr("Add support for reversing stick inputs (e.g. needed for FrSky gimbals)")); + addOpenTxCommonOptions(firmware); + firmwares.push_back(firmware); + /* 9x board */ - firmware = new OpenTxFirmware("opentx-9x", QObject::tr("9X board"), BOARD_STOCK); + firmware = new OpenTxFirmware("opentx-9x", QObject::tr("9X with stock board"), BOARD_STOCK); firmware->addOptions(ext_options); firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support")); firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); @@ -1208,7 +1317,7 @@ void registerOpenTxFirmwares() firmwares.push_back(firmware); /* 9x board with M128 chip */ - firmware = new OpenTxFirmware("opentx-9x128", QObject::tr("M128 / 9X board"), BOARD_M128); + firmware = new OpenTxFirmware("opentx-9x128", QObject::tr("9X with stock board and m128 chip"), BOARD_M128); firmware->addOptions(ext_options); firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support")); firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); @@ -1237,69 +1346,52 @@ void registerOpenTxFirmwares() addOpenTxCommonOptions(firmware); firmwares.push_back(firmware); - /* 9XR board */ - firmware = new OpenTxFirmware("opentx-9xr", QObject::tr("9XR"), BOARD_STOCK); - firmware->addOptions(extr_options); - firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support")); + /* ar9x board */ + firmware = new OpenTxFirmware("opentx-ar9x", QObject::tr("9X with AR9X board"), BOARD_AR9X); + firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support")); firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); - firmware->addOption("nosplash", QObject::tr("No splash screen")); firmware->addOption("nofp", QObject::tr("No flight modes")); firmware->addOption("nocurves", QObject::tr("Disable curves menus")); - firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker")); - firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode")); - firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode")); - // NOT TESTED firmware->addOption("PXX", QObject::tr("Support of FrSky PXX protocol")); - firmware->addOption("DSM2", QObject::tr("Support for DSM2 modules")); firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); + firmware->addOption("timer3", QObject::tr("Support for a third timer")); firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); + firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time")); firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); firmware->addOption("battgraph", QObject::tr("Battery graph")); firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items")); - firmware->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics")); - firmware->addOption("pgbar", QObject::tr("EEprom write Progress bar")); - firmware->addOption("imperial", QObject::tr("Imperial units")); - firmware->addOption("nowshh", QObject::tr("No Winged Shadow How High support")); - firmware->addOption("novario", QObject::tr("No vario support")); - firmware->addOption("nogps", QObject::tr("No GPS support")); - firmware->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen")); - firmware->addOption("stickrev", QObject::tr("Add support for reversing stick inputs (e.g. needed for FrSky gimbals)")); + firmware->addOption("bluetooth", QObject::tr("Bluetooth interface")); +// firmware->addOption("rtc", QObject::tr("Optional RTC added")); +// firmware->addOption("volume", QObject::tr("i2c volume control added")); addOpenTxCommonOptions(firmware); firmwares.push_back(firmware); - /* 9XR board with M128 chip */ - firmware = new OpenTxFirmware("opentx-9xr128", QObject::tr("9XR with M128 chip"), BOARD_M128); - firmware->addOptions(extr_options); - firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support")); + /* Sky9x board */ + firmware = new OpenTxFirmware("opentx-sky9x", QObject::tr("9X with Sky9x board"), BOARD_SKY9X); + firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support")); firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); - firmware->addOption("nosplash", QObject::tr("No splash screen")); firmware->addOption("nofp", QObject::tr("No flight modes")); firmware->addOption("nocurves", QObject::tr("Disable curves menus")); - firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker")); - firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode")); - firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode")); - // NOT TESTED firmware->addOption("PXX", QObject::tr("Support of FrSky PXX protocol")); - firmware->addOption("DSM2", QObject::tr("Support for DSM2 modules")); firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); + firmware->addOption("timer3", QObject::tr("Support for a third timer")); firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); + firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time")); firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); firmware->addOption("battgraph", QObject::tr("Battery graph")); firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items")); - firmware->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics")); - firmware->addOption("pgbar", QObject::tr("EEprom write Progress bar")); - firmware->addOption("imperial", QObject::tr("Imperial units")); + firmware->addOption("bluetooth", QObject::tr("Bluetooth interface")); addOpenTxCommonOptions(firmware); firmwares.push_back(firmware); /* Gruvin9x board */ - firmware = new OpenTxFirmware("opentx-gruvin9x", QObject::tr("Gruvin9x board / 9X"), BOARD_GRUVIN9X); + firmware = new OpenTxFirmware("opentx-gruvin9x", QObject::tr("9X with Gruvin9x board"), BOARD_GRUVIN9X); firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support")); firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); firmware->addOption("nofp", QObject::tr("No flight modes")); @@ -1324,7 +1416,7 @@ void registerOpenTxFirmwares() firmwares.push_back(firmware); /* MEGA2560 board */ - firmware = new OpenTxFirmware("opentx-mega2560", QObject::tr("MEGA2560 board"), BOARD_MEGA2560); + firmware = new OpenTxFirmware("opentx-mega2560", QObject::tr("DIY MEGA2560 radio"), BOARD_MEGA2560); addOpenTxLcdOptions(firmware); firmware->addOption("PWR", QObject::tr("Power management by soft-off circuitry")); firmware->addOptions(ext_options); @@ -1353,99 +1445,6 @@ void registerOpenTxFirmwares() addOpenTxCommonOptions(firmware); firmwares.push_back(firmware); - /* Sky9x board */ - firmware = new OpenTxFirmware("opentx-sky9x", QObject::tr("Sky9x board / 9X"), BOARD_SKY9X); - firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support")); - firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); - firmware->addOption("nofp", QObject::tr("No flight modes")); - firmware->addOption("nocurves", QObject::tr("Disable curves menus")); - firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); - firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); - firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); - firmware->addOption("timer3", QObject::tr("Support for a third timer")); - firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); - firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); - firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); - firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time")); - firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); - firmware->addOption("battgraph", QObject::tr("Battery graph")); - firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items")); - firmware->addOption("bluetooth", QObject::tr("Bluetooth interface")); - addOpenTxCommonOptions(firmware); - firmwares.push_back(firmware); - - /* ar9x board */ - firmware = new OpenTxFirmware("opentx-ar9x", QObject::tr("ar9x board / 9X"), BOARD_AR9X); - firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support")); - firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); - firmware->addOption("nofp", QObject::tr("No flight modes")); - firmware->addOption("nocurves", QObject::tr("Disable curves menus")); - firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); - firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); - firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); - firmware->addOption("timer3", QObject::tr("Support for a third timer")); - firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); - firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); - firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); - firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time")); - firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); - firmware->addOption("battgraph", QObject::tr("Battery graph")); - firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items")); - firmware->addOption("bluetooth", QObject::tr("Bluetooth interface")); -// firmware->addOption("rtc", QObject::tr("Optional RTC added")); -// firmware->addOption("volume", QObject::tr("i2c volume control added")); - addOpenTxCommonOptions(firmware); - firmwares.push_back(firmware); - - /* 9XR-Pro */ - firmware = new OpenTxFirmware("opentx-9xrpro", QObject::tr("9XR-PRO"), BOARD_9XRPRO); - firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support")); - firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu")); - firmware->addOption("nofp", QObject::tr("No flight modes")); - firmware->addOption("nocurves", QObject::tr("Disable curves menus")); - firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits")); - firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT); - firmware->addOption("symlimits", QObject::tr("Symetrical Limits")); - firmware->addOption("timer3", QObject::tr("Support for a third timer")); - firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation")); - firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control")); - firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control")); - firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders")); - firmware->addOption("battgraph", QObject::tr("Battery graph")); - firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items")); - firmware->addOption("bluetooth", QObject::tr("Bluetooth interface")); - addOpenTxCommonOptions(firmware); - firmwares.push_back(firmware); - - /* Taranis board */ - firmware = new OpenTxFirmware("opentx-taranis", QObject::tr("FrSky Taranis"), BOARD_TARANIS); - firmware->addOption("haptic", QObject::tr("Haptic module installed")); - addOpenTxTaranisOptions(firmware); - addOpenTxCommonOptions(firmware); - firmwares.push_back(firmware); - - /* Taranis Plus board */ - firmware = new OpenTxFirmware("opentx-taranisplus", QObject::tr("FrSky Taranis Plus"), BOARD_TARANIS_PLUS); - addOpenTxTaranisOptions(firmware); - addOpenTxCommonOptions(firmware); - firmwares.push_back(firmware); - - /* Taranis X9E board */ - firmware = new OpenTxFirmware("opentx-taranisx9e", QObject::tr("FrSky Taranis X9E"), BOARD_TARANIS_X9E); - firmware->addOption("shutdownconfirm", QObject::tr("Confirmation before radio shutdown")); - firmware->addOption("horussticks", QObject::tr("Horus magnetic sticks")); - addOpenTxTaranisOptions(firmware); - addOpenTxCommonOptions(firmware); - firmwares.push_back(firmware); - - /* Horus board */ - firmware = new OpenTxFirmware("opentx-horus", QObject::tr("FrSky Horus"), BOARD_HORUS); - firmware->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support")); - firmware->addOption("nogvars", QObject::tr("Disable Global variables")); - firmware->addOption("lua", QObject::tr("Support for Lua model scripts")); - addOpenTxCommonOptions(firmware); - firmwares.push_back(firmware); - default_firmware_variant = GetFirmware("opentx-taranisplus-en"); current_firmware_variant = default_firmware_variant; }