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

Do not include moduledata.h in boards.h

Browse Source 
As it is used from the simulator classes, which uses radio source files as well.
This commit is contained in:
Raphael Coeffic
2022-01-02 13:31:33 +01:00
parent aa79087e4d
commit 944f98048a
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/boards.cpp
+15 -15
View File
@@ -810,29 +810,29 @@ StringTagMappingTable Boards::getTrimSourcesLookupTable(Board::Type board)
return tbl; return tbl;
} }
QList<ModuleType> Boards::getSupportedInternalModules(Board::Type board) QList<int> Boards::getSupportedInternalModules(Board::Type board)
{ {
QList<ModuleType> modules; QList<int> modules;
if (IS_TARANIS_X9DP_2019(board) || IS_TARANIS_X7_ACCESS(board)) { if (IS_TARANIS_X9DP_2019(board) || IS_TARANIS_X7_ACCESS(board)) {
modules = {MODULE_TYPE_ISRM_PXX2}; modules = {(int)MODULE_TYPE_ISRM_PXX2};
} else if (IS_FLYSKY_NV14(board)) { } else if (IS_FLYSKY_NV14(board)) {
modules = {MODULE_TYPE_FLYSKY}; modules = {(int)MODULE_TYPE_FLYSKY};
} else if (IS_FAMILY_HORUS_OR_T16(board) || IS_FAMILY_T12(board) } else if (IS_FAMILY_HORUS_OR_T16(board) || IS_FAMILY_T12(board)
|| (IS_TARANIS_SMALL(board) && IS_ACCESS_RADIO(board))) { || (IS_TARANIS_SMALL(board) && IS_ACCESS_RADIO(board))) {
modules.append({ modules.append({
MODULE_TYPE_XJT_PXX1, (int)MODULE_TYPE_XJT_PXX1,
MODULE_TYPE_ISRM_PXX2, (int)MODULE_TYPE_ISRM_PXX2,
MODULE_TYPE_CROSSFIRE, (int)MODULE_TYPE_CROSSFIRE,
MODULE_TYPE_MULTIMODULE, (int)MODULE_TYPE_MULTIMODULE,
}); });
} else if (IS_TARANIS(board)) { } else if (IS_TARANIS(board)) {
modules = {MODULE_TYPE_XJT_PXX1}; modules = {(int)MODULE_TYPE_XJT_PXX1};
} }
return modules; return modules;
} }
ModuleType Boards::getDefaultInternalModules(Board::Type board) int Boards::getDefaultInternalModules(Board::Type board)
{ {
switch(board) { switch(board) {
case BOARD_TARANIS_X7: case BOARD_TARANIS_X7:
@@ -842,7 +842,7 @@ ModuleType Boards::getDefaultInternalModules(Board::Type board)
case BOARD_HORUS_X12S: case BOARD_HORUS_X12S:
case BOARD_X10: case BOARD_X10:
case BOARD_TARANIS_XLITE: case BOARD_TARANIS_XLITE:
return MODULE_TYPE_XJT_PXX1; return (int)MODULE_TYPE_XJT_PXX1;
case BOARD_TARANIS_X7_ACCESS: case BOARD_TARANIS_X7_ACCESS:
case BOARD_TARANIS_X9DP_2019: case BOARD_TARANIS_X9DP_2019:
@@ -850,7 +850,7 @@ ModuleType Boards::getDefaultInternalModules(Board::Type board)
case BOARD_TARANIS_XLITES: case BOARD_TARANIS_XLITES:
case BOARD_TARANIS_X9LITE: case BOARD_TARANIS_X9LITE:
case BOARD_TARANIS_X9LITES: case BOARD_TARANIS_X9LITES:
return MODULE_TYPE_ISRM_PXX2; return (int)MODULE_TYPE_ISRM_PXX2;
case BOARD_JUMPER_T12: case BOARD_JUMPER_T12:
case BOARD_JUMPER_T16: case BOARD_JUMPER_T16:
@@ -861,12 +861,12 @@ ModuleType Boards::getDefaultInternalModules(Board::Type board)
case BOARD_JUMPER_TLITE: case BOARD_JUMPER_TLITE:
case BOARD_RADIOMASTER_ZORRO: case BOARD_RADIOMASTER_ZORRO:
case BOARD_JUMPER_TPRO: case BOARD_JUMPER_TPRO:
return MODULE_TYPE_MULTIMODULE; return (int)MODULE_TYPE_MULTIMODULE;
case BOARD_FLYSKY_NV14: case BOARD_FLYSKY_NV14:
return MODULE_TYPE_FLYSKY; return (int)MODULE_TYPE_FLYSKY;
default: default:
return MODULE_TYPE_NONE; return (int)MODULE_TYPE_NONE;
} }
} }
companion/src/firmwares/boards.h
+2 -3
View File
@@ -20,7 +20,6 @@
#pragma once #pragma once
#include "datahelpers.h" #include "datahelpers.h"
#include "moduledata.h"
#include <QtCore> #include <QtCore>
#include <QObject> #include <QObject>
@@ -220,8 +219,8 @@ class Boards
static AbstractStaticItemModel * intModuleTypeItemModel(); static AbstractStaticItemModel * intModuleTypeItemModel();
static StringTagMappingTable getTrimSwitchesLookupTable(Board::Type board); static StringTagMappingTable getTrimSwitchesLookupTable(Board::Type board);
static StringTagMappingTable getTrimSourcesLookupTable(Board::Type board); static StringTagMappingTable getTrimSourcesLookupTable(Board::Type board);
static QList<ModuleType> getSupportedInternalModules(Board::Type board); static QList<int> getSupportedInternalModules(Board::Type board);
static ModuleType getDefaultInternalModules(Board::Type board); static int getDefaultInternalModules(Board::Type board);
protected: protected: