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

Set B-Side as Default for ACS Board #822

Merged
meggert merged 5 commits from acs-board-b-as-default into dev-7.5.0 2023-11-30 11:49:31 +01:00
Conversation 0 Commits 5 Files Changed 2 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7239b2e26d - Show all commits

2
CHANGELOG.md
View File

@ -20,6 +20,8 @@ will consitute of a breaking change warranting a new major release:
- ACS-Board default side changed to B-Side - ACS-Board default side changed to B-Side
# [v7.4.0] 2023-12-XX
## Changed ## Changed
- Rewrote the PLOC Supervisor Handler, which is now based on a new device handler base class. - Rewrote the PLOC Supervisor Handler, which is now based on a new device handler base class.

4
mission/system/acs/acsModeTree.cpp
View File

@ -160,8 +160,8 @@ void buildOffSequence(Subsystem& ss, ModeListEntry& eh) {
// Build OFF transition 1 // Build OFF transition 1
iht(objects::IMTQ_ASSY, OFF, 0, ACS_TABLE_OFF_TRANS_1.second); iht(objects::IMTQ_ASSY, OFF, 0, ACS_TABLE_OFF_TRANS_1.second);
iht(objects::STR_ASSY, OFF, 0, ACS_TABLE_OFF_TRANS_1.second); iht(objects::STR_ASSY, OFF, 0, ACS_TABLE_OFF_TRANS_1.second);
iht(objects::ACS_BOARD_ASS, OFF, duallane::B_SIDE, ACS_TABLE_OFF_TRANS_1.second); iht(objects::ACS_BOARD_ASS, OFF, 0, ACS_TABLE_OFF_TRANS_1.second);
iht(objects::SUS_BOARD_ASS, OFF, duallane::A_SIDE, ACS_TABLE_OFF_TRANS_1.second); iht(objects::SUS_BOARD_ASS, OFF, 0, ACS_TABLE_OFF_TRANS_1.second);
iht(objects::RW_ASSY, OFF, 0, ACS_TABLE_OFF_TRANS_1.second); iht(objects::RW_ASSY, OFF, 0, ACS_TABLE_OFF_TRANS_1.second);
check(ss.addTable(TableEntry(ACS_TABLE_OFF_TRANS_1.first, &ACS_TABLE_OFF_TRANS_1.second)), ctxc); check(ss.addTable(TableEntry(ACS_TABLE_OFF_TRANS_1.first, &ACS_TABLE_OFF_TRANS_1.second)), ctxc);