From bf65d13849e22dd8745bbc8cf159bfe2be9f92ec Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Sat, 18 Feb 2023 11:53:01 +0100 Subject: [PATCH] pdec handler check locks during init --- linux/ipcore/PdecHandler.cpp | 1 + mission/system/tree/comModeTree.cpp | 2 +- mission/system/tree/system.cpp | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/linux/ipcore/PdecHandler.cpp b/linux/ipcore/PdecHandler.cpp index b6b684e9..b59dc904 100644 --- a/linux/ipcore/PdecHandler.cpp +++ b/linux/ipcore/PdecHandler.cpp @@ -164,6 +164,7 @@ ReturnValue_t PdecHandler::irqOperation() { state = State::WAIT_FOR_RECOVERY; return result; } + checkLocks(); state = State::RUNNING; break; case State::RUNNING: { diff --git a/mission/system/tree/comModeTree.cpp b/mission/system/tree/comModeTree.cpp index 7e771892..222d1f7d 100644 --- a/mission/system/tree/comModeTree.cpp +++ b/mission/system/tree/comModeTree.cpp @@ -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; } diff --git a/mission/system/tree/system.cpp b/mission/system/tree/system.cpp index 69345bf3..cb6202f1 100644 --- a/mission/system/tree/system.cpp +++ b/mission/system/tree/system.cpp @@ -3,7 +3,7 @@ #include #include #include - +#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);