feat: Flysky PL18U Support (#6114)
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
co-authored by
Peter Feerick
parent
d81513d4f2
commit
f4c019bbb1
@@ -356,6 +356,8 @@ elseif(PCB STREQUAL PL18 AND PCBREV STREQUAL EL18)
|
||||
set(FLAVOUR el18)
|
||||
elseif(PCB STREQUAL PL18 AND PCBREV STREQUAL PL18EV)
|
||||
set(FLAVOUR pl18ev)
|
||||
elseif(PCB STREQUAL PL18 AND PCBREV STREQUAL PL18U)
|
||||
set(FLAVOUR pl18u)
|
||||
elseif(PCB STREQUAL PL18)
|
||||
set(FLAVOUR pl18)
|
||||
elseif(PCB STREQUAL ST16)
|
||||
|
||||
@@ -157,6 +157,7 @@ uint32_t Boards::getFourCC(Type board)
|
||||
return 0x3A78746F;
|
||||
case BOARD_FLYSKY_PL18:
|
||||
case BOARD_FLYSKY_PL18EV:
|
||||
case BOARD_FLYSKY_PL18U:
|
||||
return 0x4878746F;
|
||||
case BOARD_FLYSKY_ST16:
|
||||
return 0x4C78746F;
|
||||
@@ -218,6 +219,7 @@ int Boards::getEEpromSize(Board::Type board)
|
||||
case BOARD_FLYSKY_EL18:
|
||||
case BOARD_FLYSKY_PL18:
|
||||
case BOARD_FLYSKY_PL18EV:
|
||||
case BOARD_FLYSKY_PL18U:
|
||||
case BOARD_FLYSKY_ST16:
|
||||
case BOARD_FATFISH_F16:
|
||||
case BOARD_HELLORADIOSKY_V16:
|
||||
@@ -278,6 +280,7 @@ int Boards::getFlashSize(Type board)
|
||||
case BOARD_FLYSKY_EL18:
|
||||
case BOARD_FLYSKY_PL18:
|
||||
case BOARD_FLYSKY_PL18EV:
|
||||
case BOARD_FLYSKY_PL18U:
|
||||
case BOARD_FLYSKY_ST16:
|
||||
case BOARD_FATFISH_F16:
|
||||
case BOARD_HELLORADIOSKY_V16:
|
||||
@@ -516,7 +519,7 @@ StringTagMappingTable Boards::getLegacyAnalogsLookupTable(Board::Type board)
|
||||
{tr("SL1").toStdString(), "LS"},
|
||||
{tr("SL2").toStdString(), "RS"},
|
||||
});
|
||||
} else if (IS_FLYSKY_PL18(board)) {
|
||||
} else if (IS_FLYSKY_PL18(board) || IS_FLYSKY_PL18U(board)) {
|
||||
tbl.insert(tbl.end(), {
|
||||
{tr("P1").toStdString(), "POT1"},
|
||||
{tr("P2").toStdString(), "POT2"},
|
||||
@@ -661,6 +664,8 @@ QString Boards::getBoardName(Board::Type board)
|
||||
return "FlySky PL18";
|
||||
case BOARD_FLYSKY_PL18EV:
|
||||
return "FlySky PL18EV";
|
||||
case BOARD_FLYSKY_PL18U:
|
||||
return "FlySky PL18U";
|
||||
case BOARD_FLYSKY_ST16:
|
||||
return "FlySky ST16";
|
||||
case BOARD_BETAFPV_LR3PRO:
|
||||
@@ -801,6 +806,7 @@ int Boards::getDefaultInternalModules(Board::Type board)
|
||||
return (int)MODULE_TYPE_FLYSKY_AFHDS2A;
|
||||
|
||||
case BOARD_FLYSKY_EL18:
|
||||
case BOARD_FLYSKY_PL18U:
|
||||
return (int)MODULE_TYPE_FLYSKY_AFHDS3;
|
||||
|
||||
default:
|
||||
@@ -861,6 +867,7 @@ void Boards::getBattRange(Board::Type board, int& vmin, int& vmax, unsigned int&
|
||||
break;
|
||||
case BOARD_FLYSKY_PL18:
|
||||
case BOARD_FLYSKY_PL18EV:
|
||||
case BOARD_FLYSKY_PL18U:
|
||||
BR(35, 43, 37)
|
||||
break;
|
||||
case BOARD_FLYSKY_ST16:
|
||||
|
||||
@@ -79,6 +79,7 @@ namespace Board {
|
||||
BOARD_FLYSKY_NV14,
|
||||
BOARD_FLYSKY_PL18,
|
||||
BOARD_FLYSKY_PL18EV,
|
||||
BOARD_FLYSKY_PL18U,
|
||||
BOARD_FLYSKY_ST16,
|
||||
BOARD_RADIOMASTER_ZORRO,
|
||||
BOARD_JUMPER_TPRO,
|
||||
@@ -619,7 +620,12 @@ inline bool IS_HELLORADIOSKY_V16(Board::Type board)
|
||||
|
||||
inline bool IS_FAMILY_T16(Board::Type board)
|
||||
{
|
||||
return board == Board::BOARD_JUMPER_T15 || board == Board::BOARD_JUMPER_T16 || board == Board::BOARD_RADIOMASTER_TX16S || board == Board::BOARD_JUMPER_T18 || board == Board::BOARD_FATFISH_F16 || board == Board::BOARD_HELLORADIOSKY_V16;
|
||||
return board == Board::BOARD_JUMPER_T15 ||
|
||||
board == Board::BOARD_JUMPER_T16 ||
|
||||
board == Board::BOARD_JUMPER_T18 ||
|
||||
board == Board::BOARD_RADIOMASTER_TX16S ||
|
||||
board == Board::BOARD_FATFISH_F16 ||
|
||||
board == Board::BOARD_HELLORADIOSKY_V16;
|
||||
}
|
||||
|
||||
inline bool IS_FAMILY_T12(Board::Type board)
|
||||
@@ -667,6 +673,11 @@ inline bool IS_FLYSKY_PL18EV(Board::Type board)
|
||||
return (board == Board::BOARD_FLYSKY_PL18EV);
|
||||
}
|
||||
|
||||
inline bool IS_FLYSKY_PL18U(Board::Type board)
|
||||
{
|
||||
return (board == Board::BOARD_FLYSKY_PL18U);
|
||||
}
|
||||
|
||||
inline bool IS_FLYSKY_ST16(Board::Type board)
|
||||
{
|
||||
return (board == Board::BOARD_FLYSKY_ST16);
|
||||
@@ -674,7 +685,7 @@ inline bool IS_FLYSKY_ST16(Board::Type board)
|
||||
|
||||
inline bool IS_FAMILY_PL18(Board::Type board)
|
||||
{
|
||||
return IS_FLYSKY_PL18(board) || IS_FLYSKY_PL18EV(board);
|
||||
return IS_FLYSKY_PL18(board) || IS_FLYSKY_PL18EV(board) || IS_FLYSKY_PL18U(board);
|
||||
}
|
||||
|
||||
inline bool IS_TARANIS_XLITE(Board::Type board)
|
||||
|
||||
@@ -224,6 +224,8 @@ void GeneralSettings::init()
|
||||
strcpy(bluetoothName, "pl18");
|
||||
else if (IS_FLYSKY_PL18EV(board))
|
||||
strcpy(bluetoothName, "pl18ev");
|
||||
else if (IS_FLYSKY_PL18U(board))
|
||||
strcpy(bluetoothName, "pl18u");
|
||||
else if (IS_FLYSKY_ST16(board))
|
||||
strcpy(bluetoothName, "st16");
|
||||
else if (IS_FAMILY_HORUS_OR_T16(board))
|
||||
|
||||
@@ -85,9 +85,9 @@ bool ModuleData::isAvailable(PulsesProtocol proto, int port)
|
||||
return true;
|
||||
case PULSES_PXX_XJT_X16:
|
||||
case PULSES_PXX_XJT_LR12:
|
||||
return !IS_ACCESS_RADIO(board, id) && !IS_FAMILY_T16(board) && !IS_FAMILY_T12(board) && !IS_FLYSKY_NV14(board);
|
||||
return !IS_ACCESS_RADIO(board, id) && !IS_FAMILY_T16(board) && !IS_FAMILY_T12(board) && !IS_FLYSKY_NV14(board) && !IS_FLYSKY_EL18(board) && !IS_FLYSKY_PL18(board) && !IS_FLYSKY_ST16(board);
|
||||
case PULSES_PXX_XJT_D8:
|
||||
return !(IS_ACCESS_RADIO(board, id) || id.contains("eu")) && !IS_FAMILY_T16(board) && !IS_FAMILY_T12(board) && !IS_FLYSKY_NV14(board);
|
||||
return !(IS_ACCESS_RADIO(board, id) || id.contains("eu")) && !IS_FAMILY_T16(board) && !IS_FAMILY_T12(board) && !IS_FLYSKY_NV14(board) && !IS_FLYSKY_EL18(board) && !IS_FLYSKY_PL18(board) && !IS_FLYSKY_ST16(board);
|
||||
case PULSES_ACCESS_ISRM:
|
||||
case PULSES_ACCST_ISRM_D16:
|
||||
return IS_ACCESS_RADIO(board, id);
|
||||
@@ -98,7 +98,7 @@ bool ModuleData::isAvailable(PulsesProtocol proto, int port)
|
||||
case PULSES_FLYSKY_AFHDS2A:
|
||||
return IS_FLYSKY_NV14(board);
|
||||
case PULSES_FLYSKY_AFHDS3:
|
||||
return IS_FLYSKY_EL18(board);
|
||||
return (IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board));
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
@@ -124,7 +124,7 @@ bool ModuleData::isAvailable(PulsesProtocol proto, int port)
|
||||
case PULSES_GHOST:
|
||||
return true;
|
||||
case PULSES_ACCESS_R9M:
|
||||
return IS_ACCESS_RADIO(board, id) || (IS_FAMILY_HORUS_OR_T16(board) && id.contains("externalaccessmod"));
|
||||
return IS_ACCESS_RADIO(board, id) || (IS_FAMILY_HORUS_OR_T16(board) && id.contains("externalaccessmod"));
|
||||
case PULSES_PXX_R9M_LITE:
|
||||
case PULSES_ACCESS_R9M_LITE:
|
||||
case PULSES_ACCESS_R9M_LITE_PRO:
|
||||
|
||||
@@ -302,7 +302,7 @@ int OpenTxFirmware::getCapability(::Capability capability)
|
||||
else
|
||||
return 40;
|
||||
case HasAuxSerialMode:
|
||||
return (IS_FAMILY_HORUS_OR_T16(board) && !(IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board))) ||
|
||||
return (IS_FAMILY_HORUS_OR_T16(board) && !(IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board) || IS_FLYSKY_ST16(board))) ||
|
||||
(IS_TARANIS_X9(board) && !IS_TARANIS_X9DP_2019(board)) ||
|
||||
IS_RADIOMASTER_ZORRO(board) || IS_RADIOMASTER_TX12_MK2(board) || IS_RADIOMASTER_MT12(board);
|
||||
case HasAux2SerialMode:
|
||||
@@ -349,13 +349,15 @@ int OpenTxFirmware::getCapability(::Capability capability)
|
||||
IS_RADIOMASTER_MT12(board);
|
||||
case HasIntModuleFlySky:
|
||||
return id.contains("afhds2a") || id.contains("afhds3") ||
|
||||
IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board);
|
||||
IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board);
|
||||
case BacklightLevelMin:
|
||||
if (IS_HORUS_X12S(board))
|
||||
if (IS_HORUS_X12S(board)) {
|
||||
return 5;
|
||||
if (IS_FAMILY_T16(board) || IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board))
|
||||
} else if (IS_FAMILY_T16(board) || IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board) || IS_FLYSKY_ST16(board)) {
|
||||
return 1;
|
||||
return 46;
|
||||
} else {
|
||||
return 46;
|
||||
}
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
@@ -512,6 +514,13 @@ void registerOpenTxFirmwares()
|
||||
addOpenTxRfOptions(firmware, FLEX + AFHDS3);
|
||||
registerOpenTxFirmware(firmware);
|
||||
|
||||
/* FlySky PL18U board */
|
||||
firmware = new OpenTxFirmware(FIRMWAREID("pl18u"), Firmware::tr("FlySky PL18U"), BOARD_FLYSKY_PL18U);
|
||||
addOpenTxFrskyOptions(firmware);
|
||||
firmware->addOption(opt_bt);
|
||||
addOpenTxRfOptions(firmware, FLEX + AFHDS3);
|
||||
registerOpenTxFirmware(firmware);
|
||||
|
||||
/* FlySky ST16 board */
|
||||
firmware = new OpenTxFirmware(FIRMWAREID("st16"), Firmware::tr("FlySky ST16"), BOARD_FLYSKY_ST16);
|
||||
addOpenTxFrskyOptions(firmware);
|
||||
|
||||
@@ -145,7 +145,7 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
|
||||
}
|
||||
}
|
||||
|
||||
if (IS_FLYSKY_NV14(board)) {
|
||||
if (IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board)) {
|
||||
addLabel(tr("Dead zone"));
|
||||
AutoComboBox *spnStickDeadZone = new AutoComboBox(this);
|
||||
spnStickDeadZone->setModel(GeneralSettings::stickDeadZoneItemModel());
|
||||
|
||||
Reference in New Issue
Block a user