Merge pull request #1165 from opentx/projectkk2glider/noexpo_showing_bug

Projectkk2glider/noexpo showing bug

companion/src/eeprominterface.h

@@ -1067,7 +1067,6 @@ enum Capability {
  FlightModesName,
  FlightModesHaveFades,
  Mixes,
- MixesWithoutExpo,
  Timers,
  TimeDivisions,
  CustomFunctions,
@@ -1102,6 +1101,7 @@ enum Capability {
  ModelTrainerEnable,
  Timer2ThrTrig,
  HasExpoNames,
+ HasNoExpo,
  HasMixerNames,
  HasChNames,
  HasCvNames,

companion/src/firmwares/opentx/opentxinterface.cpp

@@ -586,14 +586,14 @@ int OpenTxFirmware::getCapability(const Capability capability)
       return 1;
     case DSM2Indexes:
       return 1;
-    case MixesWithoutExpo:
-      return 1;
     case NumCurves:
       return (IS_TARANIS(board) ? 32 : (IS_ARM(board) ? 16 : 8));
     case HasMixerNames:
       return (IS_ARM(board) ? (IS_TARANIS(board) ? 8 : 6) : false);
     case HasExpoNames:
       return (IS_ARM(board) ? (IS_TARANIS(board) ? 8 : 6) : false);
+    case HasNoExpo:
+      return (IS_TARANIS(board) ? false : true);
     case ChannelsName:
       return (IS_TARANIS(board) ? 6 : 0);
     case HasCvNames:

companion/src/modeledit/mixerdialog.cpp

@@ -30,7 +30,7 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
 
     ui->MixDR_CB->setChecked(md->noExpo==0);
 
-    if (firmware->getCapability(VirtualInputs) || !firmware->getCapability(MixesWithoutExpo)) {
+    if (!firmware->getCapability(HasNoExpo)) {
       ui->MixDR_CB->hide();
       ui->label_MixDR->hide();
     }
@@ -143,7 +143,7 @@ void MixerDialog::valuesChanged()
     lock = true;
     QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
     md->srcRaw  = RawSource(ui->sourceCB->itemData(ui->sourceCB->currentIndex()).toInt(), &model);
-    if (!firmware->getCapability(VirtualInputs) && firmware->getCapability(MixesWithoutExpo)) {
+    if (firmware->getCapability(HasNoExpo)) {
       bool drVisible = (md->srcRaw.type == SOURCE_TYPE_STICK && md->srcRaw.index < NUM_STICKS);
       ui->MixDR_CB->setEnabled(drVisible);
       ui->label_MixDR->setEnabled(drVisible);

companion/src/modeledit/mixes.cpp

@@ -195,7 +195,7 @@ QString MixesPanel::getMixerText(int dest, bool * new_ch)
       str += " " + Qt::escape(tr("NoTrim"));
     }
 
-    if (md->noExpo)      str += " " + Qt::escape(tr("No DR/Expo"));
+    if (firmware->getCapability(HasNoExpo) && md->noExpo) str += " " + Qt::escape(tr("No DR/Expo"));
     if (md->sOffset)     str += " " + Qt::escape(tr("Offset(%1)").arg(getGVarString(md->sOffset)));
     if (md->curve.value) str += " " + Qt::escape(md->curve.toString());
 

companion/src/printdialog.cpp

@@ -351,7 +351,7 @@ void PrintDialog::printMixes()
         str += " " + Qt::escape(tr("NoTrim"));
       }
 
-      if (md->noExpo)      str += " " + Qt::escape(tr("No DR/Expo"));
+      if (firmware->getCapability(HasNoExpo) && md->noExpo) str += " " + Qt::escape(tr("No DR/Expo"));
       if (md->sOffset)     str += " " + Qt::escape(tr("Offset(%1)").arg(getGVarString(md->sOffset)));
       if (md->curve.value) str += " " + Qt::escape(md->curve.toString());