piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

New multi protocols (#6920)

Browse Source 
* New Multi protocols

Scanner
FrSkyX RX
Flyskys AFHDS2A RX

* Skip Multi/Scanner protocol

* added new protocols in companion
This commit is contained in:
Raphael Coeffic
2019-10-10 15:29:39 +02:00
committed by 3djc
parent c3db736e33
commit 54bb04f049
10 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modeledit/setup.cpp
+6 -3
View File
@@ -223,6 +223,8 @@ ModulePanel::ModulePanel(QWidget * parent, ModelData & model, ModuleData & modul
}
}
for (int i=0; i<=MODULE_SUBTYPE_MULTI_LAST; i++) {
if (i == MODULE_SUBTYPE_MULTI_SCANNER)
continue;
ui->multiProtocol->addItem(Multiprotocols::protocolToString(i), i);
}
@@ -543,7 +545,7 @@ void ModulePanel::update()
ui->lowPower->setVisible(mask & MASK_MULTIMODULE);
if (mask & MASK_MULTIMODULE) {
ui->multiProtocol->setCurrentIndex(module.multi.rfProtocol);
ui->multiProtocol->setCurrentIndex(ui->multiProtocol->findData(module.multi.rfProtocol));
ui->autoBind->setChecked(module.multi.autoBindMode);
ui->lowPower->setChecked(module.multi.lowPowerMode);
}
@@ -714,9 +716,10 @@ void ModulePanel::on_failsafeMode_currentIndexChanged(int value)
void ModulePanel::onMultiProtocolChanged(int index)
{
if (!lock && module.multi.rfProtocol != (unsigned)index) {
int rfProtocol = ui->multiProtocol->itemData(index).toInt();
if (!lock && module.multi.rfProtocol != (unsigned)rfProtocol) {
lock=true;
module.multi.rfProtocol = (unsigned int) index;
module.multi.rfProtocol = (unsigned int)rfProtocol;
unsigned int maxSubTypes = multiProtocols.getProtocol(index).numSubTypes();
if (module.multi.customProto)
maxSubTypes=8;