eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Merge remote-tracking branch 'origin/develop' into mueller/tcs_subsystem

Browse Source
This commit is contained in:
Robin Müller
2022-12-02 16:24:50 +01:00
parent d08546e5fe 3c29a4fc55
commit b1f861b59c
124 changed files with 12768 additions and 3385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mission/system/tree/acsModeTree.cpp
View File

@ -30,7 +30,7 @@ static const auto NML = DeviceHandlerIF::MODE_NORMAL;
auto ACS_SEQUENCE_OFF =
std::make_pair(acs::CtrlModes::OFF << 24, FixedArrayList<ModeListEntry, 2>());
auto ACS_TABLE_OFF_TGT =
std::make_pair((acs::CtrlModes::OFF << 24) | 1, FixedArrayList<ModeListEntry, 0>());
std::make_pair((acs::CtrlModes::OFF << 24) | 1, FixedArrayList<ModeListEntry, 1>());
auto ACS_TABLE_OFF_TRANS =
std::make_pair((acs::CtrlModes::OFF << 24) | 2, FixedArrayList<ModeListEntry, 6>());