From 1a9bc1e86f7e3b8562690d119c63857d76abf977 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Tue, 11 Jun 2024 11:07:55 +0800 Subject: [PATCH 1/2] feat(el18): Added internal ELRS support --- radio/src/targets/nv14/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt index 4bc5964c0d1..aac53e1d817 100644 --- a/radio/src/targets/nv14/CMakeLists.txt +++ b/radio/src/targets/nv14/CMakeLists.txt @@ -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() From 326f88488c14e41937c1587f676e4937a9f34237 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sun, 7 Jul 2024 04:20:55 +0000 Subject: [PATCH 2/2] chore(cpn): allow CRSF as an internal module type --- companion/src/firmwares/boards.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/companion/src/firmwares/boards.cpp b/companion/src/firmwares/boards.cpp index 0bfde994f8a..2b011be9aa1 100644 --- a/companion/src/firmwares/boards.cpp +++ b/companion/src/firmwares/boards.cpp @@ -616,9 +616,12 @@ QList 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,