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

PTME rework reset handling #542

Merged
muellerr merged 12 commits from ptme_rework_reset_handling into develop 2023-03-31 17:26:53 +02:00
Conversation 0 Commits 12 Files Changed 37 +4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f16d92c1b1 - Show all commits

4
mission/com/CcsdsIpCoreHandler.cpp
View File

@ -31,6 +31,7 @@ CcsdsIpCoreHandler::CcsdsIpCoreHandler(object_id_t objectId, object_id_t tcDesti
auto mqArgs = MqArgs(objectId, static_cast<void*>(this)); auto mqArgs = MqArgs(objectId, static_cast<void*>(this));
eventQueue = eventQueue =
QueueFactory::instance()->createMessageQueue(10, EventMessage::EVENT_MESSAGE_SIZE, &mqArgs); QueueFactory::instance()->createMessageQueue(10, EventMessage::EVENT_MESSAGE_SIZE, &mqArgs);
ptmeLocked = true;
} }
CcsdsIpCoreHandler::~CcsdsIpCoreHandler() = default; CcsdsIpCoreHandler::~CcsdsIpCoreHandler() = default;
@ -79,6 +80,8 @@ ReturnValue_t CcsdsIpCoreHandler::initialize() {
} else { } else {
enablePrioritySelectMode(); enablePrioritySelectMode();
} }
resetPtme();
ptmeLocked = false;
#if OBSW_SYRLINKS_SIMULATED == 1 #if OBSW_SYRLINKS_SIMULATED == 1
// Update data on rising edge // Update data on rising edge
@ -330,6 +333,7 @@ void CcsdsIpCoreHandler::initPtmeUpdateAfterXCycles() {
if (not updateContext.performPtmeUpdateAfterXCycles) { if (not updateContext.performPtmeUpdateAfterXCycles) {
updateContext.performPtmeUpdateAfterXCycles = true; updateContext.performPtmeUpdateAfterXCycles = true;
updateContext.ptmeUpdateCycleCount = 0; updateContext.ptmeUpdateCycleCount = 0;
ptmeLocked = true;
} }
} }