Companion firmware options:

* layout changed to 4 columns
 * fixed broken options (by commit 51cb50151)
 * added missing "horussticks" for X9E

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) {

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);