|
|
|
@ -55,13 +55,13 @@ auto ACS_TABLE_SAFE_TRANS_0 =
|
|
|
|
|
auto ACS_TABLE_SAFE_TRANS_1 =
|
|
|
|
|
std::make_pair((acs::AcsMode::SAFE << 24) | 3, FixedArrayList<ModeListEntry, 1>());
|
|
|
|
|
|
|
|
|
|
auto ACS_SEQUENCE_IDLE = std::make_pair(acs::AcsMode::IDLE, FixedArrayList<ModeListEntry, 3>());
|
|
|
|
|
auto ACS_SEQUENCE_IDLE = std::make_pair(acs::AcsMode::PTG_IDLE, FixedArrayList<ModeListEntry, 3>());
|
|
|
|
|
auto ACS_TABLE_IDLE_TGT =
|
|
|
|
|
std::make_pair((acs::AcsMode::IDLE << 24) | 1, FixedArrayList<ModeListEntry, 6>());
|
|
|
|
|
std::make_pair((acs::AcsMode::PTG_IDLE << 24) | 1, FixedArrayList<ModeListEntry, 6>());
|
|
|
|
|
auto ACS_TABLE_IDLE_TRANS_0 =
|
|
|
|
|
std::make_pair((acs::AcsMode::IDLE << 24) | 2, FixedArrayList<ModeListEntry, 6>());
|
|
|
|
|
std::make_pair((acs::AcsMode::PTG_IDLE << 24) | 2, FixedArrayList<ModeListEntry, 6>());
|
|
|
|
|
auto ACS_TABLE_IDLE_TRANS_1 =
|
|
|
|
|
std::make_pair((acs::AcsMode::IDLE << 24) | 3, FixedArrayList<ModeListEntry, 2>());
|
|
|
|
|
std::make_pair((acs::AcsMode::PTG_IDLE << 24) | 3, FixedArrayList<ModeListEntry, 2>());
|
|
|
|
|
|
|
|
|
|
auto ACS_TABLE_PTG_TRANS_0 =
|
|
|
|
|
std::make_pair((acs::AcsMode::PTG_TARGET << 24) | 2, FixedArrayList<ModeListEntry, 5>());
|
|
|
|
@ -82,17 +82,17 @@ auto ACS_TABLE_PTG_TARGET_GS_TRANS_1 =
|
|
|
|
|
|
|
|
|
|
auto ACS_SEQUENCE_PTG_TARGET_NADIR =
|
|
|
|
|
std::make_pair(acs::AcsMode::PTG_NADIR, FixedArrayList<ModeListEntry, 3>());
|
|
|
|
|
auto ACS_TABLE_PTG_TARGET_NADIR_TGT = std::make_pair((acs::AcsMode::PTG_TARGET_NADIR << 24) | 1,
|
|
|
|
|
FixedArrayList<ModeListEntry, 6>());
|
|
|
|
|
auto ACS_TABLE_PTG_TARGET_NADIR_TRANS_1 = std::make_pair(
|
|
|
|
|
(acs::AcsMode::PTG_TARGET_NADIR << 24) | 3, FixedArrayList<ModeListEntry, 1>());
|
|
|
|
|
auto ACS_TABLE_PTG_TARGET_NADIR_TGT =
|
|
|
|
|
std::make_pair((acs::AcsMode::PTG_NADIR << 24) | 1, FixedArrayList<ModeListEntry, 6>());
|
|
|
|
|
auto ACS_TABLE_PTG_TARGET_NADIR_TRANS_1 =
|
|
|
|
|
std::make_pair((acs::AcsMode::PTG_NADIR << 24) | 3, FixedArrayList<ModeListEntry, 1>());
|
|
|
|
|
|
|
|
|
|
auto ACS_SEQUENCE_PTG_TARGET_INERTIAL =
|
|
|
|
|
std::make_pair(acs::AcsMode::PTG_INERTIAL, FixedArrayList<ModeListEntry, 3>());
|
|
|
|
|
auto ACS_TABLE_PTG_TARGET_INERTIAL_TGT = std::make_pair(
|
|
|
|
|
(acs::AcsMode::PTG_TARGET_INERTIAL << 24) | 1, FixedArrayList<ModeListEntry, 6>());
|
|
|
|
|
auto ACS_TABLE_PTG_TARGET_INERTIAL_TRANS_1 = std::make_pair(
|
|
|
|
|
(acs::AcsMode::PTG_TARGET_INERTIAL << 24) | 3, FixedArrayList<ModeListEntry, 1>());
|
|
|
|
|
auto ACS_TABLE_PTG_TARGET_INERTIAL_TGT =
|
|
|
|
|
std::make_pair((acs::AcsMode::PTG_INERTIAL << 24) | 1, FixedArrayList<ModeListEntry, 6>());
|
|
|
|
|
auto ACS_TABLE_PTG_TARGET_INERTIAL_TRANS_1 =
|
|
|
|
|
std::make_pair((acs::AcsMode::PTG_INERTIAL << 24) | 3, FixedArrayList<ModeListEntry, 1>());
|
|
|
|
|
|
|
|
|
|
void satsystem::acs::init() {
|
|
|
|
|
ModeListEntry entry;
|
|
|
|
@ -291,11 +291,7 @@ void buildIdleSequence(Subsystem& ss, ModeListEntry& eh) {
|
|
|
|
|
check(sequence.insert(eh), ctxc);
|
|
|
|
|
};
|
|
|
|
|
// Build IDLE target
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::CtrlSubmode::PTG_IDLE, ACS_TABLE_IDLE_TGT.second);
|
|
|
|
|
=======
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::AcsMode::IDLE, ACS_TABLE_IDLE_TGT.second);
|
|
|
|
|
>>>>>>> origin/develop
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::AcsMode::PTG_IDLE, ACS_TABLE_IDLE_TGT.second);
|
|
|
|
|
iht(objects::IMTQ_HANDLER, NML, 0, ACS_TABLE_IDLE_TGT.second);
|
|
|
|
|
iht(objects::RW_ASS, NML, 0, ACS_TABLE_IDLE_TGT.second);
|
|
|
|
|
iht(objects::SUS_BOARD_ASS, NML, 0, ACS_TABLE_IDLE_TGT.second);
|
|
|
|
@ -311,11 +307,7 @@ void buildIdleSequence(Subsystem& ss, ModeListEntry& eh) {
|
|
|
|
|
ss.addTable(&ACS_TABLE_IDLE_TRANS_0.second, ACS_TABLE_IDLE_TRANS_0.first, false, true);
|
|
|
|
|
|
|
|
|
|
// Build IDLE transition 1
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::CtrlSubmode::PTG_IDLE, ACS_TABLE_IDLE_TRANS_1.second);
|
|
|
|
|
=======
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::AcsMode::IDLE, ACS_TABLE_IDLE_TRANS_1.second);
|
|
|
|
|
>>>>>>> origin/develop
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::AcsMode::PTG_IDLE, ACS_TABLE_IDLE_TRANS_1.second);
|
|
|
|
|
ss.addTable(&ACS_TABLE_IDLE_TRANS_1.second, ACS_TABLE_IDLE_TRANS_1.first, false, true);
|
|
|
|
|
|
|
|
|
|
// Build IDLE sequence
|
|
|
|
@ -358,8 +350,7 @@ void buildTargetPtSequence(Subsystem& ss, ModeListEntry& eh) {
|
|
|
|
|
|
|
|
|
|
// Transition 0 already built
|
|
|
|
|
// Build TARGET PT transition 1
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::AcsMode::PTG_TARGET,
|
|
|
|
|
ACS_TABLE_PTG_TARGET_TRANS_1.second);
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::AcsMode::PTG_TARGET, ACS_TABLE_PTG_TARGET_TRANS_1.second);
|
|
|
|
|
check(ss.addTable(&ACS_TABLE_PTG_TARGET_TRANS_1.second, ACS_TABLE_PTG_TARGET_TRANS_1.first, false,
|
|
|
|
|
true),
|
|
|
|
|
ctxc);
|
|
|
|
@ -407,11 +398,7 @@ void buildTargetPtNadirSequence(Subsystem& ss, ModeListEntry& eh) {
|
|
|
|
|
|
|
|
|
|
// Transition 0 already built
|
|
|
|
|
// Build TARGET PT transition 1
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::CtrlSubmode::PTG_NADIR,
|
|
|
|
|
=======
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::AcsMode::PTG_TARGET_NADIR,
|
|
|
|
|
>>>>>>> origin/develop
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::AcsMode::PTG_NADIR,
|
|
|
|
|
ACS_TABLE_PTG_TARGET_NADIR_TRANS_1.second);
|
|
|
|
|
check(ss.addTable(TableEntry(ACS_TABLE_PTG_TARGET_NADIR_TRANS_1.first,
|
|
|
|
|
&ACS_TABLE_PTG_TARGET_NADIR_TRANS_1.second)),
|
|
|
|
@ -497,11 +484,7 @@ void buildTargetPtInertialSequence(Subsystem& ss, ModeListEntry& eh) {
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Build TARGET PT table
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::CtrlSubmode::PTG_INERTIAL,
|
|
|
|
|
=======
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::AcsMode::PTG_TARGET_INERTIAL,
|
|
|
|
|
>>>>>>> origin/develop
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::AcsMode::PTG_INERTIAL,
|
|
|
|
|
ACS_TABLE_PTG_TARGET_INERTIAL_TGT.second);
|
|
|
|
|
iht(objects::IMTQ_HANDLER, NML, 0, ACS_TABLE_PTG_TARGET_INERTIAL_TGT.second);
|
|
|
|
|
iht(objects::SUS_BOARD_ASS, NML, 0, ACS_TABLE_PTG_TARGET_INERTIAL_TGT.second);
|
|
|
|
@ -514,11 +497,7 @@ void buildTargetPtInertialSequence(Subsystem& ss, ModeListEntry& eh) {
|
|
|
|
|
|
|
|
|
|
// Transition 0 already built
|
|
|
|
|
// Build TARGET PT transition 1
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::CtrlSubmode::PTG_INERTIAL,
|
|
|
|
|
=======
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::AcsMode::PTG_TARGET_INERTIAL,
|
|
|
|
|
>>>>>>> origin/develop
|
|
|
|
|
iht(objects::ACS_CONTROLLER, NML, acs::AcsMode::PTG_INERTIAL,
|
|
|
|
|
ACS_TABLE_PTG_TARGET_INERTIAL_TRANS_1.second);
|
|
|
|
|
check(ss.addTable(TableEntry(ACS_TABLE_PTG_TARGET_INERTIAL_TRANS_1.first,
|
|
|
|
|
&ACS_TABLE_PTG_TARGET_INERTIAL_TRANS_1.second)),
|
|
|
|
|