[Companion] Servos limits are displayed in us if ppmus option selected

companion/src/eeprominterface.h

@@ -1135,6 +1135,7 @@ enum Capability {
   HasSoundMixer,
   NumModules,
   PPMCenter,
+  PPMUnitMicroseconds,
   SYMLimits,
   HasCurrentCalibration,
   HasVolume,

companion/src/firmwares/opentx/opentxinterface.cpp

@@ -665,7 +665,9 @@ int OpenTxFirmware::getCapability(const Capability capability)
     case TelemetryMaxMultiplier:
       return (IS_ARM(board) ? 32 : 8);
     case PPMCenter:
-      return (IS_TARANIS(board) ? 500 : 125);
+      return (IS_TARANIS(board) ? 500 : (id.contains("ppmca") ? 125 : 0));
+    case PPMUnitMicroseconds:
+      return id.contains("ppmus") ? 1 : 0;      
     case SYMLimits:
       return 1;
     case OptrexDisplay:

companion/src/helpers.cpp

@@ -147,7 +147,7 @@ void populatePhasesCB(QComboBox *b, int value)
   b->setCurrentIndex(value + GetCurrentFirmware()->getCapability(FlightModes));
 }
 
-GVarGroup::GVarGroup(QCheckBox *weightGV, QAbstractSpinBox *weightSB, QComboBox *weightCB, int & weight, const int deflt, const int mini, const int maxi, const double step, const unsigned int flags):
+GVarGroup::GVarGroup(QCheckBox *weightGV, QAbstractSpinBox *weightSB, QComboBox *weightCB, int & weight, const int deflt, const int mini, const int maxi, const double step, bool allowGvars):
   QObject(),
   weightGV(weightGV),
   weightSB(weightSB),
@@ -156,10 +156,9 @@ GVarGroup::GVarGroup(QCheckBox *weightGV, QAbstractSpinBox *weightSB, QComboBox
   weightCB(weightCB),
   weight(weight),
   step(step),
-  flags(flags),
   lock(true)
 {
-  if (GetCurrentFirmware()->getCapability(Gvars)) {
+  if (allowGvars && GetCurrentFirmware()->getCapability(Gvars)) {
     populateGVCB(weightCB, weight);
     connect(weightGV, SIGNAL(stateChanged(int)), this, SLOT(gvarCBChanged(int)));
     connect(weightCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));

companion/src/helpers.h

@@ -42,7 +42,7 @@ class GVarGroup: public QObject {
   Q_OBJECT
 
   public:
-    GVarGroup(QCheckBox *weightGV, QAbstractSpinBox *weightSB, QComboBox *weightCB, int & weight, const int deflt, const int mini, const int maxi, const double step=1, const unsigned int flags=0);
+    GVarGroup(QCheckBox *weightGV, QAbstractSpinBox *weightSB, QComboBox *weightCB, int & weight, const int deflt, const int mini, const int maxi, const double step=1, bool allowGVars=true);
 
   protected slots:
     void gvarCBChanged(int);
@@ -56,7 +56,6 @@ class GVarGroup: public QObject {
     QComboBox *weightCB;
     int & weight;
     double step;
-    unsigned int flags;
     bool lock;
 };
 

companion/src/modeledit/channels.cpp

@@ -7,6 +7,74 @@
 #include <QCheckBox>
 #include <QDoubleSpinBox>
 
+LimitsGroup::LimitsGroup(FirmwareInterface * firmware, QGridLayout *gridLayout, int row, int col, int & value, int min, int max, int deflt):
+  firmware(firmware),
+  spinbox(new QDoubleSpinBox()),
+  value(value),
+  step(1.0)
+{
+
+  bool allowGVars = false;
+
+  spinbox->setProperty("index", row);
+  spinbox->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+  spinbox->setAccelerated(true);
+
+  if (firmware->getCapability(PPMUnitMicroseconds)) {
+    step = 5.12;
+    spinbox->setDecimals(1);
+    spinbox->setSuffix("us");
+  }
+  else {
+    spinbox->setDecimals(0);
+    spinbox->setSuffix("%");
+  }
+
+  if (IS_TARANIS(firmware->getBoard()) || deflt == 0 /*it's the offset*/) {
+    min *= 10;
+    max *= 10;
+    deflt *= 10;
+    step /= 10;
+    spinbox->setDecimals(1);
+    allowGVars = true;
+  }
+
+  spinbox->setSingleStep(step);
+
+  QHBoxLayout * horizontalLayout = new QHBoxLayout();
+  QCheckBox * gv = new QCheckBox(QObject::tr("GV"));
+  horizontalLayout->addWidget(gv);
+  QComboBox * cb = new QComboBox();
+  horizontalLayout->addWidget(cb);
+  horizontalLayout->addWidget(spinbox);
+  gridLayout->addLayout(horizontalLayout, row, col, 1, 1);
+  gvarGroup = new GVarGroup(gv, spinbox, cb, value, deflt, min, max, step, allowGVars);
+}
+
+LimitsGroup::~LimitsGroup()
+{
+  delete gvarGroup;
+}
+
+void LimitsGroup::updateMinMax(int max)
+{
+  if (IS_TARANIS(firmware->getBoard())) {
+    max *= 10;
+  }
+  if (spinbox->maximum() == 0) {
+    spinbox->setMinimum(-step*max);
+    if (value < -max) {
+      value = -max;
+    }
+  }
+  if (spinbox->minimum() == 0) {
+    spinbox->setMaximum(step*max);
+    if (value > max) {
+      value = max;
+    }
+  }
+}
+
 Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
   ModelPanel(parent, model, generalSettings, firmware)
 {
@@ -52,85 +120,13 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
     }
 
     // Channel offset
-    QDoubleSpinBox * offset = new QDoubleSpinBox(this);
+    limitsGroups << new LimitsGroup(firmware, gridLayout, i+1, col++, model.limitData[i].offset, -100, 100, 0);
-    offset->setProperty("index", i);
-    offset->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    offset->setAccelerated(true);
-    offset->setDecimals(1);
-    offset->setSingleStep(0.1);
-    if (IS_TARANIS(firmware->getBoard())) {
-      QHBoxLayout * horizontalLayout = new QHBoxLayout();
-      QCheckBox * ofsGV = new QCheckBox(tr("GV"));
-      horizontalLayout->addWidget(ofsGV);
-      QComboBox * ofsCB = new QComboBox(this);
-      horizontalLayout->addWidget(ofsCB);
-      horizontalLayout->addWidget(offset);
-      gridLayout->addLayout(horizontalLayout, i+1, col++, 1, 1);
-      ofsGroup = new GVarGroup(ofsGV, offset, ofsCB, model.limitData[i].offset, 0, -10*model.getChannelsMax(), 10*model.getChannelsMax(), 0.1);
-    }
-    else {
-      offset->setMinimum(-100);
-      offset->setMaximum(100);
-      offset->setValue(float(model.limitData[i].offset) / 10);
-      connect(offset, SIGNAL(editingFinished()), this, SLOT(offsetEdited()));
-      gridLayout->addWidget(offset, i+1, col++, 1, 1);
-    }
 
     // Channel min
-    QDoubleSpinBox * minSB = new QDoubleSpinBox(this);
+    limitsGroups << new LimitsGroup(firmware, gridLayout, i+1, col++, model.limitData[i].min, -model.getChannelsMax(), 0, -100);
-    minSB->setProperty("index", i);
-    minSB->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    minSB->setAccelerated(true);
-    if (IS_TARANIS(firmware->getBoard())) {
-      QHBoxLayout * horizontalLayout = new QHBoxLayout();
-      QCheckBox * minGV = new QCheckBox(tr("GV"));
-      horizontalLayout->addWidget(minGV);
-      QComboBox * minCB = new QComboBox(this);
-      horizontalLayout->addWidget(minCB);
-      minSB->setDecimals(1);
-      minSB->setSingleStep(0.1);
-      horizontalLayout->addWidget(minSB);
-      gridLayout->addLayout(horizontalLayout, i+1, col++, 1, 1);
-      minGroup = new GVarGroup(minGV, minSB, minCB, model.limitData[i].min, -1000, -10*model.getChannelsMax(), 0, 0.1);
-    }
-    else {
-      minSB->setDecimals(0);
-      minSB->setSingleStep(1);
-      minSB->setMinimum(-model.getChannelsMax());
-      minSB->setMaximum(0);
-      minSB->setValue(model.limitData[i].min / 10);
-      connect(minSB, SIGNAL(editingFinished()), this, SLOT(minEdited()));
-      gridLayout->addWidget(minSB, i+1, col++, 1, 1);
-    }
-    minSpins << minSB;
 
     // Channel max
-    QDoubleSpinBox * maxSB = new QDoubleSpinBox(this);
+    limitsGroups << new LimitsGroup(firmware, gridLayout, i+1, col++, model.limitData[i].max, 0, model.getChannelsMax(), 100);
-    maxSB->setProperty("index", i);
-    maxSB->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    maxSB->setAccelerated(true);
-    if (IS_TARANIS(firmware->getBoard())) {
-      QHBoxLayout * horizontalLayout = new QHBoxLayout();
-      QCheckBox * maxGV = new QCheckBox(tr("GV"));
-      horizontalLayout->addWidget(maxGV);
-      QComboBox * maxCB = new QComboBox(this);
-      horizontalLayout->addWidget(maxCB);
-      maxSB->setDecimals(1);
-      maxSB->setSingleStep(0.1);
-      horizontalLayout->addWidget(maxSB);
-      gridLayout->addLayout(horizontalLayout, i+1, col++, 1, 1);
-      maxGroup = new GVarGroup(maxGV, maxSB, maxCB, model.limitData[i].max, 1000, 0, 10*model.getChannelsMax(), 0.1);
-    }
-    else {
-      maxSB->setDecimals(0);
-      maxSB->setSingleStep(1);
-      maxSB->setMinimum(0);
-      maxSB->setMaximum(model.getChannelsMax());
-      maxSB->setValue(model.limitData[i].max / 10);
-      connect(maxSB, SIGNAL(editingFinished()), this, SLOT(maxEdited()));
-      gridLayout->addWidget(maxSB, i+1, col++, 1, 1);
-    }
-    maxSpins << maxSB;
 
     // Channel inversion
     QComboBox * invCB = new QComboBox(this);
@@ -159,6 +155,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
       QSpinBox * center = new QSpinBox(this);
       center->setProperty("index", i);
       center->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+      center->setSuffix("us");
       center->setMinimum(1500-ppmCenterMax);
       center->setMaximum(1500+ppmCenterMax);
       center->setValue(1500);
@@ -185,9 +182,9 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
 
 Channels::~Channels()
 {
-  delete ofsGroup;
+  foreach(LimitsGroup *group, limitsGroups) {
-  delete minGroup;
+    delete group;
-  delete maxGroup;
+  }
 }
 
 void Channels::symlimitsEdited()
@@ -210,46 +207,14 @@ void Channels::nameEdited()
   }
 }
 
-void Channels::offsetEdited()
-{
-  QDoubleSpinBox *dsb = qobject_cast<QDoubleSpinBox*>(sender());
-  int index = dsb->property("index").toInt();
-  model.limitData[index].offset = round(dsb->value() * 10);
-  emit modified();
-}
-
-void Channels::minEdited()
-{
-  QDoubleSpinBox *sb = qobject_cast<QDoubleSpinBox*>(sender());
-  int index = sb->property("index").toInt();
-  model.limitData[index].min = round(sb->value() * 10);
-  emit modified();
-}
-
-void Channels::maxEdited()
-{
-  QDoubleSpinBox *sb = qobject_cast<QDoubleSpinBox*>(sender());
-  int index = sb->property("index").toInt();
-  model.limitData[index].max = round(sb->value() * 10);
-  emit modified();
-}
-
 void Channels::refreshExtendedLimits()
 {
   int channelMax = model.getChannelsMax();
-  int channelMaxValue = channelMax * 10;
 
-  for (int i=0; i<firmware->getCapability(Outputs); i++) {
+  foreach(LimitsGroup *group, limitsGroups) {
-    QDoubleSpinBox * minDSB = minSpins[i];
+    group->updateMinMax(channelMax);
-    QDoubleSpinBox * maxDSB = maxSpins[i];
-    
-    minDSB->setMinimum(-channelMax);
-    maxDSB->setMaximum(+channelMax);
-
-    //reset any limit that is bigger than current maximum (dependent on extended limits setting)
-    if ( model.limitData[i].min < -channelMaxValue ) model.limitData[i].min = -channelMaxValue;
-    if ( model.limitData[i].max > +channelMaxValue ) model.limitData[i].max = +channelMaxValue;
   }
+
   emit modified(); 
 }
 

companion/src/modeledit/channels.h

@@ -6,6 +6,22 @@
 
 class GVarGroup;
 
+class LimitsGroup
+{
+  public:
+    LimitsGroup(FirmwareInterface * firmware, QGridLayout *gridLayout, int row, int col, int & value, int min, int max, int deflt);
+    ~LimitsGroup();
+
+    void updateMinMax(int max);
+
+  protected:
+    FirmwareInterface * firmware;
+    QDoubleSpinBox * spinbox;
+    GVarGroup * gvarGroup;
+    int & value;
+    double step;
+};
+
 class Channels : public ModelPanel
 {
     Q_OBJECT
@@ -15,11 +31,7 @@ class Channels : public ModelPanel
     ~Channels();
     
   private:
-    QVector<QDoubleSpinBox *> minSpins;
+    QVector<LimitsGroup *> limitsGroups;
-    QVector<QDoubleSpinBox *> maxSpins;
-    GVarGroup * ofsGroup;
-    GVarGroup * minGroup;
-    GVarGroup * maxGroup;
 
   public slots:
     void refreshExtendedLimits();
@@ -27,9 +39,6 @@ class Channels : public ModelPanel
   private slots:
     void symlimitsEdited();
     void nameEdited();
-    void offsetEdited();
-    void minEdited();
-    void maxEdited();
     void invEdited();
     void curveEdited();
     void ppmcenterEdited();