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

Com Subsystem #364

Merged
muellerr merged 26 commits from meier/com-ss into develop 2023-02-23 15:22:47 +01:00
Conversation 2 Commits 26 Files Changed 28 +4 -2
3 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 bf65d13849 - Show all commits

1
linux/ipcore/PdecHandler.cpp
View File

@ -164,6 +164,7 @@ ReturnValue_t PdecHandler::irqOperation() {
state = State::WAIT_FOR_RECOVERY;
return result;
}
checkLocks();
state = State::RUNNING;
break;
case State::RUNNING: {
muellerr commented 2023-02-22 19:43:00 +01:00
Review
Copy Link

Any specific reason or bug why this was added?

Any specific reason or bug why this was added?
meierj commented 2023-02-23 07:27:48 +01:00
Review
Copy Link

Yes. If the syrlinks already had a bit lock during reboot, the bit lock and carrier lock events were never triggered.

Yes. If the syrlinks already had a bit lock during reboot, the bit lock and carrier lock events were never triggered.

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

@ -67,7 +67,7 @@ Subsystem& satsystem::com::init() {
buildTxAndRxLowRateSequence(SUBSYSTEM, entry);
buildTxAndRxHighRateSequence(SUBSYSTEM, entry);
buildTxAndRxDefaultRateSequence(SUBSYSTEM, entry);
SUBSYSTEM.setInitialMode(NML, ::com::Submode::RX_ONLY);
SUBSYSTEM.setInitialMode(COM_SEQUENCE_RX_ONLY.first);
return SUBSYSTEM;
}

3
mission/system/tree/system.cpp
View File

@ -3,7 +3,7 @@
#include <fsfw/devicehandlers/DeviceHandlerIF.h>
#include <fsfw/subsystem/Subsystem.h>
#include <mission/acsDefs.h>
#include "mission/comDefs.h"
#include "acsModeTree.h"
#include "comModeTree.h"
#include "eive/objects.h"
@ -85,6 +85,7 @@ void buildSafeSequence(Subsystem& ss, ModeListEntry& eh) {
// Build SAFE transition 0. Two transitions to reduce number of consecutive events and because
// consecutive commanding of TCS and ACS can lead to SPI issues.
iht(objects::TCS_SUBSYSTEM, NML, 0, EIVE_TABLE_SAFE_TRANS_0.second);
iht(objects::COM_SUBSYSTEM, com::RX_ONLY, 0, EIVE_TABLE_SAFE_TRANS_0.second);
check(ss.addTable(TableEntry(EIVE_TABLE_SAFE_TRANS_0.first, &EIVE_TABLE_SAFE_TRANS_0.second)),
ctxc);