ExtraChannels Capacity removed

companion/src/eeprominterface.h

@@ -1022,7 +1022,6 @@ enum Capability {
  RotaryEncoders,
  Outputs,
  ChannelsName,
- ExtraChannels,
  ExtraInputs,
  ExtendedTrims,
  NumCurves,

companion/src/firmwares/er9x/er9xinterface.cpp

@@ -239,8 +239,6 @@ int Er9xInterface::getCapability(const Capability capability)
       return 13;
     case Outputs:
       return 16;
-    case ExtraChannels:
-      return 0;
     case Simulation:
       return 1;
     case Telemetry:

companion/src/firmwares/ersky9x/ersky9xinterface.cpp

@@ -283,8 +283,6 @@ int Ersky9xInterface::getCapability(const Capability capability)
       return 13;
     case Outputs:
       return ERSKY9X_NUM_CHNOUT_V11;
-    case ExtraChannels:
-      return 0;
     case Simulation:
       return 1;
     case Telemetry:

companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp

@@ -241,8 +241,6 @@ int Gruvin9xInterface::getCapability(const Capability capability)
       return 13;
     case Outputs:
       return 16;
-    case ExtraChannels:
-      return 0;
     case ExtendedTrims:
       return 500;
     case Simulation:

companion/src/firmwares/opentx/opentxinterface.cpp

@@ -581,8 +581,6 @@ int OpenTxInterface::getCapability(const Capability capability)
       return (IS_ARM(board) ? 23 : 7);
     case HasSoundMixer:
       return (IS_ARM(board) ? 1 : 0);
-    case ExtraChannels:
-      return 0;
     case ExtraInputs:
       return 1;
     case ExtendedTrims:

companion/src/firmwares/th9x/th9xinterface.cpp

@@ -159,8 +159,6 @@ int Th9xInterface::getCapability(const Capability capability)
       return TH9X_MAX_SWITCHES;
     case Outputs:
       return 8;
-    case ExtraChannels:
-      return 4;
     case OffsetWeight:
       return 125;      
     case Simulation:

companion/src/helpers.cpp

@@ -604,7 +604,7 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
       if (item == source) b->setCurrentIndex(b->count()-1);
     }
 
-    for (int i=0; i<GetEepromInterface()->getCapability(Outputs)+GetEepromInterface()->getCapability(ExtraChannels); i++) {
+    for (int i=0; i<GetEepromInterface()->getCapability(Outputs); i++) {
       item = RawSource(SOURCE_TYPE_CH, i);
       b->addItem(item.toString(), item.toValue());
       if (item == source) b->setCurrentIndex(b->count()-1);

companion/src/modeledit/mixes.cpp

@@ -69,10 +69,11 @@ void MixesPanel::update()
   unsigned int curDest = 0;
   int i;
   unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
+
   for (i=0; i<GetEepromInterface()->getCapability(Mixes); i++) {
     MixData *md = &model.mixData[i];
-    //qDebug() << "md->destCh: " << md->destCh;
-    if ((md->destCh==0) || (md->destCh>outputs+(unsigned int)GetEepromInterface()->getCapability(ExtraChannels))) continue;
+    // qDebug() << "md->destCh: " << md->destCh;
+    if (md->destCh==0 || md->destCh>outputs) continue;
     QString str = "";
     while (curDest < md->destCh-1) {
       curDest++;
@@ -82,7 +83,8 @@ void MixesPanel::update()
       curDest++;
     }
   }
-  while(curDest<outputs+GetEepromInterface()->getCapability(ExtraChannels)) {
+
+  while (curDest < outputs) {
     curDest++;
     AddMixerLine(-curDest);
   }
@@ -106,7 +108,7 @@ bool MixesPanel::AddMixerLine(int dest)
 #endif
   MixerlistWidget->addItem(itm);
   MixerlistWidget->setItemWidget(itm, getMixerWidget(str));
-  qDebug() << "MixesPanel::AddMixerLine(): " << str;
+  // qDebug() << "MixesPanel::AddMixerLine(): " << str;
   return new_ch;
 }
 
@@ -421,7 +423,7 @@ void MixesPanel::mixerHighlight()
     dest = model.mixData[idx].destCh;
   }
   highlightedSource = ( (int)highlightedSource ==  dest) ? 0 : dest;
-  qDebug() << "MixesPanel::mixerHighlight(): " << highlightedSource ;
+  // qDebug() << "MixesPanel::mixerHighlight(): " << highlightedSource ;
   for(int i=0; i<MixerlistWidget->count(); i++) {
     int t = MixerlistWidget->item(i)->data(Qt::UserRole).toByteArray().at(0);
     bool dummy;