[Companion] Horus analog input names fixed

This commit is contained in:
Bertrand Songis
2016-12-02 20:27:28 +01:00
parent c23ac292b7
commit 440ca771df
11 changed files with 67 additions and 28 deletions
+1 -1
View File
@@ -99,7 +99,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
}
for(int i=0; i < CPN_MAX_STICKS; i++) {
ui->trimCB->addItem(AnalogString(i), i+1);
ui->trimCB->addItem(firmware->getAnalogInputName(i), i+1);
}
ui->trimCB->setCurrentIndex(1 - ed->carryTrim);
+1 -1
View File
@@ -78,7 +78,7 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
// The trims
QString labels[CPN_MAX_STICKS];
for(int i=0; i < CPN_MAX_STICKS; i++) {
labels[i] = AnalogString(i);
labels[i] = firmware->getAnalogInputName(i);
}
+1 -1
View File
@@ -59,7 +59,7 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
if (!firmware->getCapability(VirtualInputs)) {
for(int i=0; i < CPN_MAX_STICKS; i++) {
ui->trimCB->addItem(AnalogString(i));
ui->trimCB->addItem(firmware->getAnalogInputName(i));
}
}
+2 -2
View File
@@ -655,7 +655,7 @@ SetupPanel::SetupPanel(QWidget * parent, ModelData & model, GeneralSettings & ge
for (int i=0; i<analogs+firmware->getCapability(RotaryEncoders); i++) {
QCheckBox * checkbox = new QCheckBox(this);
checkbox->setProperty("index", i);
checkbox->setText(i<analogs ? AnalogString(i) : RotaryEncoderString(i-analogs));
checkbox->setText(i<analogs ? firmware->getAnalogInputName(i) : RotaryEncoderString(i-analogs));
ui->centerBeepLayout->addWidget(checkbox, 0, i+1);
connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(onBeepCenterToggled(bool)));
centerBeepCheckboxes << checkbox;
@@ -718,7 +718,7 @@ SetupPanel::SetupPanel(QWidget * parent, ModelData & model, GeneralSettings & ge
for (int i=0; i<firmware->getCapability(Pots)+firmware->getCapability(Sliders); i++) {
QCheckBox * cb = new QCheckBox(this);
cb->setProperty("index", i);
cb->setText(AnalogString(i+4));
cb->setText(firmware->getAnalogInputName(i+4));
ui->potWarningLayout->addWidget(cb, 0, i+1);
connect(cb, SIGNAL(toggled(bool)), this, SLOT(potWarningToggled(bool)));
potWarningCheckboxes << cb;