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

Seq Count Persistent + MSG type counter #711

Merged
muellerr merged 14 commits from sequence-counter-persistent-msg-type-count-support into main 2023-06-28 13:37:16 +02:00
Conversation 1 Commits 14 Files Changed 13 +325 -553
36 changed files with 325 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5a15d39a1d - Show all commits

2
mission/tmtc/PusTmFunnel.cpp
View File

@@ -69,7 +69,6 @@ ReturnValue_t PusTmFunnel::handleTmPacket(TmTcMessage &message) {
} }
packet.setSequenceCount(sourceSequenceCount++); packet.setSequenceCount(sourceSequenceCount++);
sourceSequenceCount = sourceSequenceCount % ccsds::LIMIT_SEQUENCE_COUNT; sourceSequenceCount = sourceSequenceCount % ccsds::LIMIT_SEQUENCE_COUNT;
packet.updateErrorControl();
uint8_t service = packet.getMessageTypeCounter(); uint8_t service = packet.getMessageTypeCounter();
auto mapIter = msgCounterMap.find(service); auto mapIter = msgCounterMap.find(service);
if (mapIter == msgCounterMap.end()) { if (mapIter == msgCounterMap.end()) {
@@ -81,6 +80,7 @@ ReturnValue_t PusTmFunnel::handleTmPacket(TmTcMessage &message) {
mapIter->second++; mapIter->second++;
} }
packet.setMessageCount(mapIter->second); packet.setMessageCount(mapIter->second);
packet.updateErrorControl();
// Send to persistent TM store if the packet matches some filter. // Send to persistent TM store if the packet matches some filter.
MessageQueueId_t destination; MessageQueueId_t destination;