feat(cpn): add support for surface radios inc Radiomaster MT12 (#5381)

This commit is contained in:
Neil Horne
2024-09-26 20:39:51 +10:00
committed by GitHub
parent 2bd62c95c8
commit 149e1a2df0
90 changed files with 3746 additions and 2387 deletions
+90 -9
View File
@@ -199,6 +199,7 @@ int Boards::getEEpromSize(Board::Type board)
case BOARD_RADIOMASTER_ZORRO:
case BOARD_RADIOMASTER_BOXER:
case BOARD_RADIOMASTER_POCKET:
case BOARD_RADIOMASTER_MT12:
return EESIZE_TARANIS;
case BOARD_UNKNOWN:
return EESIZE_MAX;
@@ -256,6 +257,7 @@ int Boards::getFlashSize(Type board)
case BOARD_RADIOMASTER_BOXER:
case BOARD_RADIOMASTER_T8:
case BOARD_RADIOMASTER_POCKET:
case BOARD_RADIOMASTER_MT12:
return FSIZE_TARANIS;
case BOARD_HORUS_X12S:
case BOARD_X10:
@@ -283,6 +285,9 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
// TODO investigate usage of any that should be covered in BoardJson::getCapability or are no longer required
// some could be used when importing pre v2.10 configurations
switch (capability) {
case Air:
return !getCapability(board, Surface);
case FactoryInstalledPots:
if (IS_TARANIS_X9(board))
return 2;
@@ -340,6 +345,40 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
IS_RADIOMASTER_TX12_MK2(board) || IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_POCKET(board)) ||
(getCapability(board, HasExternalModuleSupport) && (IS_TARANIS(board) && !IS_FAMILY_T12(board))));
case LcdDepth:
if (IS_FAMILY_HORUS_OR_T16(board))
return 16;
else if (IS_TARANIS_SMALL(board))
return 1;
else if (IS_TARANIS(board))
return 4;
else
return 1;
case LcdHeight:
if (IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board))
return 480;
else if (IS_FLYSKY_PL18(board) || IS_JUMPER_T15(board))
return 320;
else if (IS_FAMILY_HORUS_OR_T16(board))
return 272;
else
return 64;
case LcdWidth:
if (IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board))
return 320;
else if (IS_FLYSKY_PL18(board))
return 480;
else if (IS_FAMILY_HORUS_OR_T16(board))
return 480;
else if (IS_TARANIS_SMALL(board))
return 128;
else if (IS_TARANIS(board))
return 212;
else
return 128;
case MaxAnalogs:
return getCapability(board, Board::Sticks) + getCapability(board, Board::Pots) + getCapability(board, Board::Sliders) +
getCapability(board, Board::JoystickAxes) + getCapability(board, Board::GyroAxes);
@@ -351,6 +390,9 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
else
return 250000; // less than 400K
case Surface:
return IS_RADIOMASTER_MT12(board);
default:
return getBoardJson(board)->getCapability(capability);
}
@@ -557,20 +599,22 @@ QString Boards::getBoardName(Board::Type board)
return "Jumper T20";
case BOARD_JUMPER_T20V2:
return "Jumper T20 V2";
case BOARD_RADIOMASTER_TX16S:
return "Radiomaster TX16S";
case BOARD_RADIOMASTER_TX12:
return "Radiomaster TX12";
case BOARD_RADIOMASTER_TX12_MK2:
return "Radiomaster TX12 Mark II";
case BOARD_RADIOMASTER_ZORRO:
return "Radiomaster Zorro";
case BOARD_RADIOMASTER_BOXER:
return "Radiomaster Boxer";
case BOARD_RADIOMASTER_POCKET:
return "Radiomaster Pocket";
case BOARD_RADIOMASTER_MT12:
return "Radiomaster MT12";
case BOARD_RADIOMASTER_T8:
return "Radiomaster T8";
case BOARD_RADIOMASTER_TX12:
return "Radiomaster TX12";
case BOARD_RADIOMASTER_TX12_MK2:
return "Radiomaster TX12 Mark II";
case BOARD_RADIOMASTER_TX16S:
return "Radiomaster TX16S";
case BOARD_RADIOMASTER_ZORRO:
return "Radiomaster Zorro";
case BOARD_FLYSKY_NV14:
return "FlySky NV14";
case BOARD_FLYSKY_EL18:
@@ -637,6 +681,11 @@ QList<int> Boards::getSupportedInternalModules(Board::Type board)
(int)MODULE_TYPE_FLYSKY_AFHDS3,
(int)MODULE_TYPE_CROSSFIRE,
});
} else if (IS_RADIOMASTER_MT12(board)) {
modules.append({
(int)MODULE_TYPE_CROSSFIRE,
(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({
@@ -688,6 +737,7 @@ int Boards::getDefaultInternalModules(Board::Type board)
case BOARD_BETAFPV_LR3PRO:
case BOARD_RADIOMASTER_ZORRO:
case BOARD_RADIOMASTER_BOXER:
case BOARD_RADIOMASTER_MT12:
case BOARD_RADIOMASTER_POCKET:
case BOARD_RADIOMASTER_TX12_MK2:
case BOARD_IFLIGHT_COMMANDO8:
@@ -729,7 +779,7 @@ void Boards::getBattRange(Board::Type board, int& vmin, int& vmax, unsigned int&
case BOARD_RADIOMASTER_BOXER:
case BOARD_RADIOMASTER_POCKET:
case BOARD_RADIOMASTER_ZORRO:
// case BOARD_RADIOMASTER_MT12: // TODO
case BOARD_RADIOMASTER_MT12:
case BOARD_JUMPER_T12:
case BOARD_JUMPER_T14:
case BOARD_JUMPER_TPRO:
@@ -786,6 +836,7 @@ int Boards::getDefaultExternalModuleSize(Board::Type board)
if (IS_TARANIS_X9LITE(board) ||
IS_RADIOMASTER_ZORRO(board) ||
IS_RADIOMASTER_MT12(board) ||
IS_RADIOMASTER_POCKET(board) ||
IS_JUMPER_TLITE(board) ||
IS_JUMPER_TPRO(board) ||
@@ -909,6 +960,11 @@ int Boards::getInputTagOffset(QString tag, Board::Type board)
return getBoardJson(board)->getInputTagOffset(tag);
}
int Boards::getInputThrottleIndex(Board::Type board)
{
return getBoardJson(board)->getInputThrottleIndex();
}
int Boards::getInputTypeOffset(Board::AnalogInputType type, Board::Type board)
{
return getBoardJson(board)->getInputTypeOffset(type);
@@ -929,6 +985,16 @@ int Boards::getInputsCalibrated(Board::Type board)
return getBoardJson(board)->getInputsCalibrated();
}
Board::KeyInfo Boards::getKeyInfo(int index, Board::Type board)
{
return getBoardJson(board)->getKeyInfo(index);
}
int Boards::getKeyIndex(QString key, Board::Type board)
{
return getBoardJson(board)->getKeyIndex(key);
}
Board::SwitchInfo Boards::getSwitchInfo(int index, Board::Type board)
{
return getBoardJson(board)->getSwitchInfo(index);
@@ -1023,3 +1089,18 @@ bool Boards::isSwitchFunc(int index, Board::Type board)
{
return getBoardJson(board)->isSwitchFunc(index);
}
QString Boards::getRadioTypeString(Board::Type board)
{
return getCapability(board == Board::BOARD_UNKNOWN ? getCurrentBoard() : board, Board::Air) ? tr("Flight") : tr("Drive");
}
bool Boards::isAir(Board::Type board)
{
return getCapability(board == Board::BOARD_UNKNOWN ? getCurrentBoard() : board, Board::Air);
}
bool Boards::isSurface(Board::Type board)
{
return getCapability(board == Board::BOARD_UNKNOWN ? getCurrentBoard() : board, Board::Surface);
}