chore(cpn): upgrade to Ubuntu 22.04 and Qt 6.9.0 (#5986)
Co-authored-by: elecpower <elecpower@users.noreply.github.com> Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
co-authored by
elecpower
raphaelcoeffic
parent
7264b28e62
commit
9e86a3ea84
@@ -365,7 +365,7 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
|
||||
return ((IS_TARANIS_X9LITE(board) || (IS_TARANIS_XLITE(board) && !IS_TARANIS_X9LITES(board)) ||
|
||||
IS_TARANIS_X9DP_2019(board) || IS_TARANIS_X7_ACCESS(board) || IS_RADIOMASTER_ZORRO(board) ||
|
||||
IS_RADIOMASTER_TX12_MK2(board) || IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_POCKET(board) ||
|
||||
IS_RADIOMASTER_MT12(board) || IS_RADIOMASTER_GX12(board) || IS_JUMPER_T20(board) ||
|
||||
IS_RADIOMASTER_MT12(board) || IS_RADIOMASTER_GX12(board) || IS_JUMPER_T20(board) ||
|
||||
IS_JUMPER_BUMBLEBEE(board)) || IS_FAMILY_T16(board) || IS_FAMILY_HORUS(board) ||
|
||||
(getCapability(board, HasExternalModuleSupport) && (IS_TARANIS(board) && !IS_FAMILY_T12(board))));
|
||||
|
||||
@@ -726,31 +726,25 @@ AbstractStaticItemModel * Boards::switchTypeItemModel()
|
||||
QList<int> Boards::getSupportedInternalModules(Board::Type board)
|
||||
{
|
||||
QList<int> modules;
|
||||
modules = {(int)MODULE_TYPE_NONE};
|
||||
modules.append((int)MODULE_TYPE_NONE);
|
||||
if (IS_TARANIS_X9DP_2019(board) || IS_TARANIS_X7_ACCESS(board)) {
|
||||
modules.append({(int)MODULE_TYPE_ISRM_PXX2});
|
||||
modules.append((int)MODULE_TYPE_ISRM_PXX2);
|
||||
} else if (IS_FLYSKY_NV14(board)) {
|
||||
modules.append({(int)MODULE_TYPE_FLYSKY_AFHDS2A});
|
||||
modules.append((int)MODULE_TYPE_FLYSKY_AFHDS2A);
|
||||
} else if (IS_FLYSKY_EL18(board)) {
|
||||
modules.append({
|
||||
(int)MODULE_TYPE_FLYSKY_AFHDS3,
|
||||
(int)MODULE_TYPE_CROSSFIRE,
|
||||
});
|
||||
modules.append((int)MODULE_TYPE_FLYSKY_AFHDS3);
|
||||
modules.append((int)MODULE_TYPE_CROSSFIRE);
|
||||
} else if (IS_RADIOMASTER_MT12(board)) {
|
||||
modules.append({
|
||||
(int)MODULE_TYPE_CROSSFIRE,
|
||||
(int)MODULE_TYPE_MULTIMODULE,
|
||||
});
|
||||
modules.append((int)MODULE_TYPE_CROSSFIRE);
|
||||
modules.append((int)MODULE_TYPE_MULTIMODULE);
|
||||
} else if (IS_FAMILY_HORUS_OR_T16(board) || IS_FAMILY_T12(board) ||
|
||||
(IS_TARANIS_SMALL(board) && IS_ACCESS_RADIO(board))) {
|
||||
modules.append({
|
||||
(int)MODULE_TYPE_XJT_PXX1,
|
||||
(int)MODULE_TYPE_ISRM_PXX2,
|
||||
(int)MODULE_TYPE_CROSSFIRE,
|
||||
(int)MODULE_TYPE_MULTIMODULE,
|
||||
});
|
||||
modules.append((int)MODULE_TYPE_XJT_PXX1);
|
||||
modules.append((int)MODULE_TYPE_ISRM_PXX2);
|
||||
modules.append((int)MODULE_TYPE_CROSSFIRE);
|
||||
modules.append((int)MODULE_TYPE_MULTIMODULE);
|
||||
} else if (IS_TARANIS(board)) {
|
||||
modules.append({(int)MODULE_TYPE_XJT_PXX1});
|
||||
modules.append((int)MODULE_TYPE_XJT_PXX1);
|
||||
}
|
||||
|
||||
return modules;
|
||||
|
||||
Reference in New Issue
Block a user