chore(cpn): remove redundant macro and unused fields (#7071)
This commit is contained in:
@@ -112,8 +112,7 @@ ChannelsPanel::ChannelsPanel(QWidget * parent, ModelData & model, GeneralSetting
|
||||
headerLabels << tr("Name");
|
||||
}
|
||||
headerLabels << tr("Subtrim") << tr("Min") << tr("Max") << tr("Direction");
|
||||
if (IS_HORUS_OR_TARANIS(board))
|
||||
headerLabels << tr("Curve") << tr("Plot");
|
||||
headerLabels << tr("Curve") << tr("Plot");
|
||||
if (firmware->getCapability(PPMCenter))
|
||||
headerLabels << tr("PPM Center");
|
||||
headerLabels << tr("Linear Subtrim");
|
||||
@@ -160,19 +159,17 @@ ChannelsPanel::ChannelsPanel(QWidget * parent, ModelData & model, GeneralSetting
|
||||
tableLayout->addWidget(i, col++, invCB[i]);
|
||||
|
||||
// Curve
|
||||
if (IS_HORUS_OR_TARANIS(firmware->getBoard())) {
|
||||
curveCB[i] = new QComboBox(this);
|
||||
curveCB[i]->setProperty("index", i);
|
||||
tableLayout->addWidget(i, col++, curveCB[i]);
|
||||
curveCB[i] = new QComboBox(this);
|
||||
curveCB[i]->setProperty("index", i);
|
||||
tableLayout->addWidget(i, col++, curveCB[i]);
|
||||
|
||||
curveImage[i] = new CurveImageWidget(this);
|
||||
curveImage[i]->setProperty("index", i);
|
||||
curveImage[i]->setFixedSize(QSize(100, 100));
|
||||
tableLayout->addWidget(i, col++, curveImage[i]);
|
||||
curveImage[i] = new CurveImageWidget(this);
|
||||
curveImage[i]->setProperty("index", i);
|
||||
curveImage[i]->setFixedSize(QSize(100, 100));
|
||||
tableLayout->addWidget(i, col++, curveImage[i]);
|
||||
|
||||
curveGroup[i] = new CurveReferenceUIManager(curveCB[i], curveImage[i], model.limitData[i].curve, model, sharedItemModels,
|
||||
curveRefFilteredItemModels, this);
|
||||
}
|
||||
curveGroup[i] = new CurveReferenceUIManager(curveCB[i], curveImage[i], model.limitData[i].curve, model, sharedItemModels,
|
||||
curveRefFilteredItemModels, this);
|
||||
|
||||
// PPM center
|
||||
int ppmCenterMax = firmware->getCapability(PPMCenter);
|
||||
|
||||
@@ -109,9 +109,7 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
|
||||
}
|
||||
else if (phaseIdx > 0) {
|
||||
cb->addItem(tr("Use Trim from %1 Mode %2").arg(radioMode).arg(m), m * 2);
|
||||
if (IS_HORUS_OR_TARANIS(board)) {
|
||||
cb->addItem(tr("Use Trim from %1 Mode %2 + Own Trim as an offset").arg(radioMode).arg(m), m * 2 + 1);
|
||||
}
|
||||
cb->addItem(tr("Use Trim from %1 Mode %2 + Own Trim as an offset").arg(radioMode).arg(m), m * 2 + 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -219,7 +217,7 @@ void FlightModePanel::trimUpdate(unsigned int trim)
|
||||
else {
|
||||
trimsUse[trim]->setCurrentIndex(2 + 2 * phase.trimRef[chn] + phase.trimMode[chn] - (phase.trimRef[chn] > phaseIdx ? 1 : 0));
|
||||
|
||||
if (phaseIdx == 0 || phase.trimRef[chn] == phaseIdx || (IS_HORUS_OR_TARANIS(board) && phase.trimMode[chn] != 0)) {
|
||||
if (phaseIdx == 0 || phase.trimRef[chn] == phaseIdx || phase.trimMode[chn] != 0) {
|
||||
trimsValue[trim]->setEnabled(true);
|
||||
trimsSlider[trim]->setEnabled(true);
|
||||
}
|
||||
|
||||
@@ -197,12 +197,10 @@ SetupPanel::SetupPanel(QWidget * parent, ModelData & model, GeneralSettings & ge
|
||||
ui->centerBeepLayout->addWidget(checkbox, 0, i + 1);
|
||||
connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(onBeepCenterToggled(bool)));
|
||||
centerBeepCheckboxes << checkbox;
|
||||
if (IS_HORUS_OR_TARANIS(board)) {
|
||||
if (!(generalSettings.isInputAvailable(i) &&
|
||||
(generalSettings.isInputStick(i) || (generalSettings.isInputPot(i) && !generalSettings.isInputMultiPosPot(i)) ||
|
||||
generalSettings.isInputSlider(i))))
|
||||
checkbox->hide();
|
||||
}
|
||||
if (!(generalSettings.isInputAvailable(i) &&
|
||||
(generalSettings.isInputStick(i) || (generalSettings.isInputPot(i) && !generalSettings.isInputMultiPosPot(i)) ||
|
||||
generalSettings.isInputSlider(i))))
|
||||
checkbox->hide();
|
||||
QWidget::setTabOrder(prevFocus, checkbox);
|
||||
prevFocus = checkbox;
|
||||
}
|
||||
@@ -248,7 +246,7 @@ SetupPanel::SetupPanel(QWidget * parent, ModelData & model, GeneralSettings & ge
|
||||
// Pot warnings
|
||||
prevFocus = ui->potWarningMode;
|
||||
|
||||
if (IS_HORUS_OR_TARANIS(board) && ttlInputs > 0) {
|
||||
if (ttlInputs > 0) {
|
||||
for (int i = ttlSticks; i < ttlInputs; i++) {
|
||||
RawSource src(SOURCE_TYPE_INPUT, i + 1);
|
||||
QCheckBox * cb = new QCheckBox(this);
|
||||
@@ -471,10 +469,7 @@ void SetupPanel::update()
|
||||
|
||||
updateBeepCenter();
|
||||
updateStartupSwitches();
|
||||
|
||||
if (IS_HORUS_OR_TARANIS(firmware->getBoard())) {
|
||||
updatePotWarnings();
|
||||
}
|
||||
updatePotWarnings();
|
||||
|
||||
for (int i = 0; i < CPN_MAX_MODULES + 1; i++) {
|
||||
if (modules[i]) {
|
||||
|
||||
@@ -73,19 +73,13 @@ ModulePanel::ModulePanel(QWidget * parent, ModelData & model, ModuleData & modul
|
||||
ui->label_module->setText(ModuleData::indexToString(moduleIdx, firmware));
|
||||
if (isTrainerModule(moduleIdx)) {
|
||||
ui->formLayout_col1->setSpacing(0);
|
||||
if (!IS_HORUS_OR_TARANIS(firmware->getBoard())) {
|
||||
ui->label_trainerMode->hide();
|
||||
ui->trainerMode->hide();
|
||||
}
|
||||
else {
|
||||
updateTrainerModeItemModel();
|
||||
ui->trainerMode->setField(model.trainerMode);
|
||||
connect(ui->trainerMode, &AutoComboBox::currentDataChanged, this, [=] () {
|
||||
update();
|
||||
emit updateItemModels();
|
||||
emit modified();
|
||||
});
|
||||
}
|
||||
updateTrainerModeItemModel();
|
||||
ui->trainerMode->setField(model.trainerMode);
|
||||
connect(ui->trainerMode, &AutoComboBox::currentDataChanged, this, [=] () {
|
||||
update();
|
||||
emit updateItemModels();
|
||||
emit modified();
|
||||
});
|
||||
}
|
||||
else {
|
||||
ui->label_trainerMode->hide();
|
||||
@@ -419,10 +413,8 @@ void ModulePanel::update()
|
||||
if (protocol != PULSES_MULTIMODULE && module.hasFailsafes(firmware))
|
||||
mask |= MASK_FAILSAFES;
|
||||
}
|
||||
else if (IS_HORUS_OR_TARANIS(board)) {
|
||||
if (model->trainerMode == TRAINER_MODE_SLAVE_JACK) {
|
||||
else if (model->trainerMode == TRAINER_MODE_SLAVE_JACK) {
|
||||
mask |= MASK_PPM_FIELDS | MASK_SBUSPPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT;
|
||||
}
|
||||
}
|
||||
else if (model->trainerMode != TRAINER_MODE_MASTER_JACK) {
|
||||
mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT;
|
||||
|
||||
@@ -482,11 +482,9 @@ void TelemetryPanel::update()
|
||||
{
|
||||
lock = true;
|
||||
|
||||
if (IS_HORUS_OR_TARANIS(firmware->getBoard())) {
|
||||
ui->voltsSource->updateValue();
|
||||
ui->altitudeSource->updateValue();
|
||||
ui->varioSource->updateValue();
|
||||
}
|
||||
ui->voltsSource->updateValue();
|
||||
ui->altitudeSource->updateValue();
|
||||
ui->varioSource->updateValue();
|
||||
|
||||
for (int i = 0; i < sensorCapability; ++i) {
|
||||
sensorPanels[i]->update();
|
||||
|
||||
Reference in New Issue
Block a user