Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(el18): allow for for internal CRSF mods (ELRS/mLRS/etc) #5173

Merged
merged 2 commits into from
Jul 7, 2024
Merged

feat(el18): allow for for internal CRSF mods (ELRS/mLRS/etc) #5173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a9bc1e
feat(el18): Added internal ELRS support
richardclli Jun 11, 2024
326f884
chore(cpn): allow CRSF as an internal module type
pfeerick Jul 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions companion/src/firmwares/boards.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,9 +616,12 @@ QList<int> Boards::getSupportedInternalModules(Board::Type board)
} else if (IS_FLYSKY_NV14(board)) {
modules.append({(int)MODULE_TYPE_FLYSKY_AFHDS2A});
} else if (IS_FLYSKY_EL18(board)) {
modules.append({(int)MODULE_TYPE_FLYSKY_AFHDS3});
} 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_FLYSKY_AFHDS3,
(int)MODULE_TYPE_CROSSFIRE,
});
} 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,
Expand Down
2 changes: 1 addition & 1 deletion radio/src/targets/nv14/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ add_definitions(-DBATTERY_CHARGE -DUSE_HATS_AS_KEYS)
if (PCBREV STREQUAL EL18)
set(FLAVOUR el18)
# defines existing internal modules
set(INTERNAL_MODULES AFHDS3 CACHE STRING "Internal modules")
set(INTERNAL_MODULES AFHDS3;CRSF CACHE STRING "Internal modules")
set(DEFAULT_INTERNAL_MODULE FLYSKY_AFHDS3 CACHE STRING "Default internal module")
set(AFHDS3 ON)
else()
Expand Down
Loading