Fix also companion not use the CUSTOM protocol as normal protocol anymore.
This commit is contained in:
@@ -1864,11 +1864,11 @@ unsigned int getNumSubtypes(MultiModuleRFProtocols type) {
|
|||||||
case MM_RF_PROTO_KN:
|
case MM_RF_PROTO_KN:
|
||||||
return 2;
|
return 2;
|
||||||
|
|
||||||
case MM_RF_PROTO_FRSKY:
|
|
||||||
case MM_RF_PROTO_CG023:
|
case MM_RF_PROTO_CG023:
|
||||||
case MM_RF_PROTO_MT99XX:
|
case MM_RF_PROTO_MT99XX:
|
||||||
return 3;
|
return 3;
|
||||||
|
|
||||||
|
case MM_RF_PROTO_FRSKY:
|
||||||
case MM_RF_PROTO_FLYSKY:
|
case MM_RF_PROTO_FLYSKY:
|
||||||
return 4;
|
return 4;
|
||||||
|
|
||||||
@@ -1877,7 +1877,6 @@ unsigned int getNumSubtypes(MultiModuleRFProtocols type) {
|
|||||||
return 5;
|
return 5;
|
||||||
|
|
||||||
case MM_RF_PROTO_CX10:
|
case MM_RF_PROTO_CX10:
|
||||||
case MM_RF_PROTO_CUSTOM:
|
|
||||||
return 8;
|
return 8;
|
||||||
default:
|
default:
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
@@ -873,8 +873,7 @@ enum MultiModuleRFProtocols {
|
|||||||
MM_RF_PROTO_ASSAN,
|
MM_RF_PROTO_ASSAN,
|
||||||
MM_RF_PROTO_HONTAI,
|
MM_RF_PROTO_HONTAI,
|
||||||
MM_RF_PROTO_OLRS,
|
MM_RF_PROTO_OLRS,
|
||||||
MM_RF_PROTO_CUSTOM,
|
MM_RF_PROTO_LAST= MM_RF_PROTO_OLRS
|
||||||
MM_RF_PROTO_LAST= MM_RF_PROTO_CUSTOM
|
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned int getNumSubtypes(MultiModuleRFProtocols type);
|
unsigned int getNumSubtypes(MultiModuleRFProtocols type);
|
||||||
|
|||||||
@@ -324,6 +324,8 @@ void ModulePanel::update()
|
|||||||
|
|
||||||
if (mask & MASK_MULTIMODULE) {
|
if (mask & MASK_MULTIMODULE) {
|
||||||
int numEntries = getNumSubtypes(static_cast<MultiModuleRFProtocols>(module.multi.rfProtocol));
|
int numEntries = getNumSubtypes(static_cast<MultiModuleRFProtocols>(module.multi.rfProtocol));
|
||||||
|
if (module.multi.customProto)
|
||||||
|
numEntries=8;
|
||||||
// Removes extra items
|
// Removes extra items
|
||||||
ui->multiSubType->setMaxCount(numEntries);
|
ui->multiSubType->setMaxCount(numEntries);
|
||||||
for (int i=0; i < numEntries; i++) {
|
for (int i=0; i < numEntries; i++) {
|
||||||
@@ -476,6 +478,8 @@ void ModulePanel::on_multiProtocol_currentIndexChanged(int index)
|
|||||||
lock=true;
|
lock=true;
|
||||||
module.multi.rfProtocol = index;
|
module.multi.rfProtocol = index;
|
||||||
unsigned int maxSubTypes = getNumSubtypes(static_cast<MultiModuleRFProtocols>(index));
|
unsigned int maxSubTypes = getNumSubtypes(static_cast<MultiModuleRFProtocols>(index));
|
||||||
|
if (module.multi.customProto)
|
||||||
|
maxSubTypes=8;
|
||||||
module.subType = std::min(module.subType, maxSubTypes -1);
|
module.subType = std::min(module.subType, maxSubTypes -1);
|
||||||
update();
|
update();
|
||||||
emit modified();
|
emit modified();
|
||||||
|
|||||||
Reference in New Issue
Block a user