eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 4 Pull Requests 2 Releases 119 Wiki Activity

COM Subsystem #358

Merged
muellerr merged 19 commits from com_subsystem into develop 2023-01-28 14:58:08 +01:00
Conversation 0 Commits 19 Files Changed 40 +13 -10
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d9e1a331b2 - Show all commits

21
mission/system/tree/comModeTree.cpp
View File

@ -17,28 +17,31 @@ static const auto OFF = HasModesIF::MODE_OFF;
static const auto ON = HasModesIF::MODE_ON;
static const auto NML = DeviceHandlerIF::MODE_NORMAL;
auto COM_SEQUENCE_RX_ONLY = std::make_pair(NML, FixedArrayList<ModeListEntry, 2>());
auto COM_SEQUENCE_RX_ONLY =
std::make_pair(::com::Submode::RX_ONLY, FixedArrayList<ModeListEntry, 2>());
auto COM_TABLE_RX_ONLY_TGT = std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 3>());
auto COM_TABLE_RX_ONLY_TRANS_0 =
std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 3>());
auto COM_TABLE_RX_ONLY_TRANS_1 =
std::make_pair((NML << 24) | 3, FixedArrayList<ModeListEntry, 3>());
auto COM_SEQUENCE_RX_AND_TX_LOW_RATE = std::make_pair(NML, FixedArrayList<ModeListEntry, 2>());
auto COM_SEQUENCE_RX_AND_TX_LOW_RATE =
std::make_pair(::com::Submode::RX_AND_TX_LOW_DATARATE, FixedArrayList<ModeListEntry, 2>());
auto COM_TABLE_RX_AND_TX_LOW_RATE_TGT =
std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 1>());
std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 3>());
auto COM_TABLE_RX_AND_TX_LOW_RATE_TRANS_0 =
std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 6>());
std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 3>());
auto COM_TABLE_RX_AND_TX_LOW_RATE_TRANS_1 =
std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 6>());
std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 3>());
auto COM_SEQUENCE_RX_AND_TX_HIGH_RATE = std::make_pair(NML, FixedArrayList<ModeListEntry, 2>());
auto COM_SEQUENCE_RX_AND_TX_HIGH_RATE =
std::make_pair(::com::Submode::RX_AND_TX_HIGH_DATARATE, FixedArrayList<ModeListEntry, 2>());
auto COM_TABLE_RX_AND_TX_HIGH_RATE_TGT =
std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 1>());
std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 3>());
auto COM_TABLE_RX_AND_TX_HIGH_RATE_TRANS_0 =
std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 6>());
std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 3>());
auto COM_TABLE_RX_AND_TX_HIGH_RATE_TRANS_1 =
std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 6>());
std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 3>());
namespace {
void buildRxOnlySequence(Subsystem& ss, ModeListEntry& eh);

2
tmtc

@ -1 +1 @@
Subproject commit 8b6039e15d6e1653fd9128b7d2c7991e5bee9588
Subproject commit b7e6a79704f2c2f91f046fc5fd69096f9d59cae5