Skip to content

Commit 2b3cd1d

Browse files
authoredJan 28, 2025
fix(cpn): missing sbus trainer for some handsets (#5843)
1 parent 0ab9d60 commit 2b3cd1d

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed
 

‎companion/src/firmwares/boards.cpp

+10-8
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,9 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
349349
case HasTrainerModuleSBUS:
350350
return ((IS_TARANIS_X9LITE(board) || (IS_TARANIS_XLITE(board) && !IS_TARANIS_X9LITES(board)) ||
351351
IS_TARANIS_X9DP_2019(board) || IS_TARANIS_X7_ACCESS(board) || IS_RADIOMASTER_ZORRO(board) ||
352-
IS_RADIOMASTER_TX12_MK2(board) || IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_POCKET(board)) ||
353-
IS_FAMILY_T16(board) || IS_FAMILY_HORUS(board) ||
352+
IS_RADIOMASTER_TX12_MK2(board) || IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_POCKET(board) ||
353+
IS_RADIOMASTER_MT12(board) || IS_RADIOMASTER_GX12(board) || IS_JUMPER_T20(board) ||
354+
IS_JUMPER_BUMBLEBEE(board)) || IS_FAMILY_T16(board) || IS_FAMILY_HORUS(board) ||
354355
(getCapability(board, HasExternalModuleSupport) && (IS_TARANIS(board) && !IS_FAMILY_T12(board))));
355356

356357
case LcdOLED:
@@ -856,13 +857,14 @@ int Boards::getDefaultExternalModuleSize(Board::Type board)
856857
return EXTMODSIZE_STD;
857858
}
858859

859-
if (IS_TARANIS_X9LITE(board) ||
860-
IS_RADIOMASTER_ZORRO(board) ||
861-
IS_RADIOMASTER_MT12(board) ||
860+
if (IS_TARANIS_X9LITE(board) ||
861+
IS_RADIOMASTER_ZORRO(board) ||
862+
IS_RADIOMASTER_MT12(board) ||
862863
IS_RADIOMASTER_POCKET(board) ||
863-
IS_JUMPER_TLITE(board) ||
864-
IS_JUMPER_TPRO(board) ||
865-
IS_JUMPER_T20(board) ||
864+
IS_JUMPER_TLITE(board) ||
865+
IS_JUMPER_TPRO(board) ||
866+
IS_JUMPER_T20(board) ||
867+
IS_JUMPER_BUMBLEBEE(board) ||
866868
IS_BETAFPV_LR3PRO(board))
867869
return EXTMODSIZE_SMALL;
868870

‎companion/src/firmwares/moduledata.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,8 @@ bool ModuleData::isProtocolAvailable(int moduleidx, unsigned int protocol, Gener
608608
case MODULE_TYPE_CROSSFIRE:
609609
case MODULE_TYPE_MULTIMODULE:
610610
case MODULE_TYPE_GHOST:
611+
case MODULE_TYPE_PPM:
612+
case MODULE_TYPE_SBUS:
611613
return true;
612614
default:
613615
return false;

0 commit comments

Comments
 (0)