Merge pull request #621 from opentx/bsongis/Issue554_trims_relative_default

All good!
2014-02-07 11:35:58 +01:00
parent e4ee5a0cd9 2364752a98
commit b12f76bc39
17 changed files with 310 additions and 194 deletions
@@ -684,19 +684,6 @@ void CurveGroup::valuesChanged()
  }
 }

-void populateTrimUseCB(QComboBox *b, unsigned int phase)
-{
-  b->addItem(QObject::tr("Own trim"));
-  unsigned int num_phases = GetEepromInterface()->getCapability(FlightPhases);
-  if (num_phases>0) {
-    for (unsigned int i = 0; i < num_phases; i++) {
-      if (i != phase) {
-        b->addItem(QObject::tr("Flight mode %1 trim").arg(i));
-      }
-    }
-  }
-}
-
 void populateGvarUseCB(QComboBox *b, unsigned int phase)
 {
  b->addItem(QObject::tr("Own value"));