Merge branch 'next' into bsongis/issue_2056_set_rtc_from_gps

companion/src/firmwares/opentx/opentxinterface.cpp

@@ -551,7 +551,7 @@ int OpenTxFirmware::getCapability(const Capability capability)
     case FlightModesName:
       return (IS_TARANIS(board) ? 10 : 6);
     case GvarsName:
-      return 6;
+      return (IS_9X(board) ? 0 : 6);
     case HasChNames:
       return (IS_TARANIS(board) ? 1 : 0);
     case GvarsInCS:

companion/src/modeledit/flightmodes.cpp

@@ -209,7 +209,9 @@ void FlightModePanel::update()
 
   if (ui->gvGB->isVisible()) {
     for (int i=0; i<gvCount; i++) {
-      gvNames[i]->setText(model->gvars_names[i]);
+      if (firmware->getCapability(GvarsName) > 0) {
+        gvNames[i]->setText(model->gvars_names[i]);
+      }
       gvValues[i]->setDisabled(model->isGVarLinked(phaseIdx, i));
       gvValues[i]->setValue(model->getGVarValue(phaseIdx, i));
       if (IS_TARANIS(GetEepromInterface()->getBoard()) && phaseIdx == 0) { 

companion/src/modeledit/logicalswitches.cpp

@@ -261,6 +261,7 @@ void LogicalSwitchesPanel::edited()
     }
     emit modified();
     lock = false;
+    updateLine(i);
   }
 }