Merge branch 'next' into kilrah/FAS_Offset_compensation

Conflicts:
	companion/src/modeledit/telemetry.cpp

companion/src/modeledit/telemetry.cpp

@@ -342,7 +342,7 @@ TelemetryPanel::~TelemetryPanel()
 
 void TelemetryPanel::setup()
 {
-    QSettings settings("companion9x", "companion9x");
+    QSettings settings;
     QString firmware_id = settings.value("firmware", default_firmware_variant.id).toString();
 
     lock=true;
@@ -371,15 +371,19 @@ void TelemetryPanel::setup()
 
     if (!GetEepromInterface()->getCapability(HasAltitudeSel)) {
       ui->AltitudeGPS_ChkB->hide();
-    } else {
+    }
+    else {
       ui->AltitudeGPS_ChkB->setChecked(model.frsky.FrSkyGpsAlt);
     }
-    int varioCap=GetEepromInterface()->getCapability(HasVario);
+    
     if (IS_TARANIS(GetEepromInterface()->getBoard())) {
       ui->AltitudeToolbar_ChkB->setChecked(model.frsky.altitudeDisplayed);
-    } else {
+    }
+    else {
       ui->AltitudeToolbar_ChkB->hide();
     }
+
+    int varioCap = GetEepromInterface()->getCapability(HasVario);
     if (!varioCap) {
       ui->varioLimitMax_DSB->hide();
       ui->varioLimitMinOff_ChkB->hide();
@@ -485,7 +489,8 @@ void TelemetryPanel::setup()
     if (!(GetEepromInterface()->getCapability(HasFasOffset)) && !(firmware_id.contains("fasoffset"))) {
       ui->fasOffset_label->hide();
       ui->fasOffset_DSB->hide();
-    } else {
+    }
+    else {
       ui->fasOffset_DSB->setValue(model.frsky.fasOffset/10.0);
       ui->variousGB->show();
     }
@@ -494,11 +499,13 @@ void TelemetryPanel::setup()
       ui->mahCount_label->hide();
       ui->mahCount_SB->hide();
       ui->mahCount_ChkB->hide();
-    } else {
+    }
+    else {
       if (model.frsky.mAhPersistent) {
         ui->mahCount_ChkB->setChecked(true);
         ui->mahCount_SB->setValue(model.frsky.storedMah);
-      } else {
+      }
+      else {
         ui->mahCount_SB->setDisabled(true);
       }
       ui->variousGB->show();
@@ -671,7 +678,6 @@ void TelemetryPanel::on_AltitudeGPS_ChkB_toggled(bool checked)
     if (lock) return;
     model.frsky.FrSkyGpsAlt = checked;
     emit modified();
-    //AltitudeGPS_CB
 }
 
 void TelemetryPanel::on_AltitudeToolbar_ChkB_toggled(bool checked)