From 2b3cd1d4e1505c8a3d1de8457d8480a04c6e1885 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Tue, 28 Jan 2025 10:13:33 +1000 Subject: [PATCH] fix(cpn): missing sbus trainer for some handsets (#5843) --- companion/src/firmwares/boards.cpp | 18 ++++++++++-------- companion/src/firmwares/moduledata.cpp | 2 ++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/companion/src/firmwares/boards.cpp b/companion/src/firmwares/boards.cpp index 9ebef9331..ca22eec16 100644 --- a/companion/src/firmwares/boards.cpp +++ b/companion/src/firmwares/boards.cpp @@ -349,8 +349,9 @@ int Boards::getCapability(Board::Type board, Board::Capability capability) case HasTrainerModuleSBUS: return ((IS_TARANIS_X9LITE(board) || (IS_TARANIS_XLITE(board) && !IS_TARANIS_X9LITES(board)) || IS_TARANIS_X9DP_2019(board) || IS_TARANIS_X7_ACCESS(board) || IS_RADIOMASTER_ZORRO(board) || - IS_RADIOMASTER_TX12_MK2(board) || IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_POCKET(board)) || - IS_FAMILY_T16(board) || IS_FAMILY_HORUS(board) || + IS_RADIOMASTER_TX12_MK2(board) || IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_POCKET(board) || + IS_RADIOMASTER_MT12(board) || IS_RADIOMASTER_GX12(board) || IS_JUMPER_T20(board) || + IS_JUMPER_BUMBLEBEE(board)) || IS_FAMILY_T16(board) || IS_FAMILY_HORUS(board) || (getCapability(board, HasExternalModuleSupport) && (IS_TARANIS(board) && !IS_FAMILY_T12(board)))); case LcdOLED: @@ -856,13 +857,14 @@ int Boards::getDefaultExternalModuleSize(Board::Type board) return EXTMODSIZE_STD; } - if (IS_TARANIS_X9LITE(board) || - IS_RADIOMASTER_ZORRO(board) || - IS_RADIOMASTER_MT12(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) || - IS_JUMPER_T20(board) || + IS_JUMPER_TLITE(board) || + IS_JUMPER_TPRO(board) || + IS_JUMPER_T20(board) || + IS_JUMPER_BUMBLEBEE(board) || IS_BETAFPV_LR3PRO(board)) return EXTMODSIZE_SMALL; diff --git a/companion/src/firmwares/moduledata.cpp b/companion/src/firmwares/moduledata.cpp index c2f80f507..586807f3e 100644 --- a/companion/src/firmwares/moduledata.cpp +++ b/companion/src/firmwares/moduledata.cpp @@ -608,6 +608,8 @@ bool ModuleData::isProtocolAvailable(int moduleidx, unsigned int protocol, Gener case MODULE_TYPE_CROSSFIRE: case MODULE_TYPE_MULTIMODULE: case MODULE_TYPE_GHOST: + case MODULE_TYPE_PPM: + case MODULE_TYPE_SBUS: return true; default: return false;