From 2763567122b40e2595a60b37219a251908279444 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 20 Nov 2016 18:37:58 +0100 Subject: [PATCH] Companion firmware options: * layout changed to 4 columns * fixed broken options (by commit 51cb50151) * added missing "horussticks" for X9E --- companion/src/apppreferencesdialog.cpp | 2 +- companion/src/firmwares/opentx/opentxinterface.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp index 0b0ff1b63..3e4c4bb90 100644 --- a/companion/src/apppreferencesdialog.cpp +++ b/companion/src/apppreferencesdialog.cpp @@ -473,7 +473,7 @@ void AppPreferencesDialog::populateFirmwareOptions(const Firmware * firmware) foreach(Option opt, opts) { if (index >= optionsCheckBoxes.size()) { QCheckBox * checkbox = new QCheckBox(ui->profileTab); - ui->optionsLayout->addWidget(checkbox, optionsCheckBoxes.count()/5, optionsCheckBoxes.count()%5, 1, 1); + ui->optionsLayout->addWidget(checkbox, optionsCheckBoxes.count()/4, optionsCheckBoxes.count()%4, 1, 1); optionsCheckBoxes.push_back(checkbox); connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool))); if (prevFocus) { diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 5fca42152..85277f4a1 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -1201,6 +1201,7 @@ void addOpenTxFrskyOptions(OpenTxFirmware * firmware) void addOpenTxTaranisOptions(OpenTxFirmware * firmware) { + addOpenTxFrskyOptions(firmware); firmware->addOption("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views")); firmware->addOption("internalppm", QObject::tr("Support for PPM internal module hack")); firmware->addOption("sqt5font", QObject::tr("Use alternative SQT5 font")); @@ -1242,6 +1243,7 @@ void registerOpenTxFirmwares() /* FrSky Taranis X9E board */ firmware = new OpenTxFirmware("opentx-x9e", QObject::tr("FrSky Taranis X9E"), BOARD_TARANIS_X9E); firmware->addOption("shutdownconfirm", QObject::tr("Confirmation before radio shutdown")); + firmware->addOption("horussticks", QObject::tr("Horus gimbals installed (Hall sensors)")); addOpenTxTaranisOptions(firmware); firmwares.push_back(firmware);