From a7bec62dcf7683bea8749c45480726d8d43c36e8 Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 18 Sep 2019 17:53:15 +0200 Subject: [PATCH] RXID should be ignored in D8, like on the radio (#6804) --- companion/src/modelslist.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/companion/src/modelslist.cpp b/companion/src/modelslist.cpp index b106a2896..50950872c 100644 --- a/companion/src/modelslist.cpp +++ b/companion/src/modelslist.cpp @@ -727,7 +727,7 @@ void TreeModel::refresh() protocol = moduleData.protocol; // These are the only RXs that allow nominating RX # but changing RX or copying models can leave residual configuration which can cause issues // if (protocol == PULSES_PXX_XJT_X16 || protocol == PULSES_PXX_XJT_LR12 || protocol == PULSES_PXX_R9M || protocol == PULSES_DSMX || protocol == PULSES_MULTIMODULE) { - if (protocol != PULSES_OFF && moduleData.modelId > 0) { + if ((protocol != PULSES_OFF && protocol != PULSES_PXX_XJT_D8 ) && moduleData.modelId > 0) { if (!rxs.isEmpty()) { rxs.append(", "); } @@ -751,6 +751,9 @@ void TreeModel::refresh() bool TreeModel::isModelIdUnique(unsigned modelIdx, unsigned module, unsigned protocol) { int cnt = 0; + if (protocol== PULSES_PXX_XJT_D8) + return true; + for (auto const& model: radioData->models) { if (!model.isEmpty()) { const ModuleData& moduleData = model.moduleData[module];