From 676ddee42417c2d5d07b25a1371b877fff99c284 Mon Sep 17 00:00:00 2001 From: elecpower Date: Wed, 25 Jan 2023 06:49:54 +1100 Subject: [PATCH 1/3] fix(cpn): Add gvars to input sources for colorlcd ONLY --- companion/src/modeledit/expodialog.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/companion/src/modeledit/expodialog.cpp b/companion/src/modeledit/expodialog.cpp index ff78e6f3a6a..ec8f0cfc0ca 100644 --- a/companion/src/modeledit/expodialog.cpp +++ b/companion/src/modeledit/expodialog.cpp @@ -102,9 +102,12 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G if (firmware->getCapability(VirtualInputs)) { ui->inputName->setMaxLength(firmware->getCapability(InputsLength)); + int flags = RawSource::InputSourceGroups & ~RawSource::NoneGroup & ~RawSource::InputsGroup; + flags |= RawSource::TelemGroup; + if (Boards::getCapability(firmware->getBoard(), Board::HasColorLcd)) + flags |= RawSource::GVarsGroup; id = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource), - (RawSource::InputSourceGroups & ~RawSource::NoneGroup & ~RawSource::InputsGroup) | RawSource::TelemGroup), - "RawSource"); + flags), "RawSource"); ui->sourceCB->setModel(dialogFilteredItemModels->getItemModel(id)); ui->sourceCB->setCurrentIndex(ui->sourceCB->findData(ed->srcRaw.toValue())); ui->inputName->setValidator(new QRegExpValidator(rx, this)); From ba98fba017386e04f72cb7a8b21e6830244d2c97 Mon Sep 17 00:00:00 2001 From: elecpower Date: Wed, 25 Jan 2023 16:05:59 +1100 Subject: [PATCH 2/3] Fix GVs available on all radios --- companion/src/modeledit/expodialog.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/companion/src/modeledit/expodialog.cpp b/companion/src/modeledit/expodialog.cpp index ec8f0cfc0ca..b64e0ff9dd5 100644 --- a/companion/src/modeledit/expodialog.cpp +++ b/companion/src/modeledit/expodialog.cpp @@ -103,9 +103,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G if (firmware->getCapability(VirtualInputs)) { ui->inputName->setMaxLength(firmware->getCapability(InputsLength)); int flags = RawSource::InputSourceGroups & ~RawSource::NoneGroup & ~RawSource::InputsGroup; - flags |= RawSource::TelemGroup; - if (Boards::getCapability(firmware->getBoard(), Board::HasColorLcd)) - flags |= RawSource::GVarsGroup; + flags |= RawSource::GVarsGroup | RawSource::TelemGroup; id = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource), flags), "RawSource"); ui->sourceCB->setModel(dialogFilteredItemModels->getItemModel(id)); From 63f34d1a598505e2ecbefeda5e223cb52b1fd1f9 Mon Sep 17 00:00:00 2001 From: elecpower Date: Wed, 25 Jan 2023 16:07:04 +1100 Subject: [PATCH 3/3] Move GVs in source list from after telemetry to before --- companion/src/datamodels/compounditemmodels.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/companion/src/datamodels/compounditemmodels.cpp b/companion/src/datamodels/compounditemmodels.cpp index c4b0f00e762..00c12df4c99 100644 --- a/companion/src/datamodels/compounditemmodels.cpp +++ b/companion/src/datamodels/compounditemmodels.cpp @@ -120,9 +120,9 @@ RawSourceItemModel::RawSourceItemModel(const GeneralSettings * const generalSett addItems(SOURCE_TYPE_CYC, RawSource::SourcesGroup, CPN_MAX_CYC); addItems(SOURCE_TYPE_PPM, RawSource::SourcesGroup, firmware->getCapability(TrainerInputs)); addItems(SOURCE_TYPE_CH, RawSource::SourcesGroup, firmware->getCapability(Outputs)); + addItems(SOURCE_TYPE_GVAR, RawSource::GVarsGroup, firmware->getCapability(Gvars)); addItems(SOURCE_TYPE_SPECIAL, RawSource::TelemGroup, SOURCE_TYPE_SPECIAL_COUNT); addItems(SOURCE_TYPE_TELEMETRY, RawSource::TelemGroup, firmware->getCapability(Sensors) * 3); - addItems(SOURCE_TYPE_GVAR, RawSource::GVarsGroup, firmware->getCapability(Gvars)); } void RawSourceItemModel::setDynamicItemData(QStandardItem * item, const RawSource & src) const