eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 3 Pull Requests Releases 118 Wiki Activity

Persistent TM Store #320

Merged
muellerr merged 109 commits from mueller/pus-15-tm-storage into develop 2023-02-24 19:03:39 +01:00
Conversation 0 Commits 109 Files Changed 62 +12 -3
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fcc9858b66 - Show all commits

12
mission/tmtc/PusTmFunnel.cpp
View File

@ -11,8 +11,8 @@ PusTmFunnel::PusTmFunnel(object_id_t objectId, TimeReaderIF &timeReader, Storage
: TmFunnelBase(objectId, tmStore, messageDepth),
timeReader(timeReader),
miscStore(objects::MISC_STORE, "misc", RolloverInterval::HOURLY, 8, sdcMan) {
miscStore.addApid(config::EIVE_PUS_APID);
miscStore.addService(17);
miscStore.addApid(config::EIVE_PUS_APID);
miscStore.addService(17);
}
PusTmFunnel::~PusTmFunnel() = default;
@ -55,6 +55,8 @@ ReturnValue_t PusTmFunnel::handlePacket(TmTcMessage &message) {
sourceSequenceCount = sourceSequenceCount % ccsds::LIMIT_SEQUENCE_COUNT;
packet.updateErrorControl();
miscStore.passPacket(packet);
for (unsigned int idx = 0; idx < destinations.size(); idx++) {
const auto &destVcidPair = destinations[idx];
if (destinations.size() > 1) {
@ -87,3 +89,9 @@ ReturnValue_t PusTmFunnel::handlePacket(TmTcMessage &message) {
}
const char *PusTmFunnel::getName() const { return "PUS TM Funnel"; }
ReturnValue_t PusTmFunnel::initialize() {
miscStore.updateBaseDir();
miscStore.updateCurrentTimestamp();
return returnvalue::OK;
}

1
mission/tmtc/PusTmFunnel.h
View File

@ -39,6 +39,7 @@ class PusTmFunnel : public TmFunnelBase {
TmStore miscStore;
ReturnValue_t handlePacket(TmTcMessage &message);
ReturnValue_t initialize() override;
};
#endif // FSFW_EXAMPLE_COMMON_PUSTMFUNNEL_H

2
mission/tmtc/TmStore.h
View File

@ -28,7 +28,6 @@ class TmStore : public SystemObject {
void updateBaseDir();
ReturnValue_t updateCurrentTimestamp();
ReturnValue_t passPacket(PusTmReader& reader);
ReturnValue_t storePacket(PusTmReader& reader);
private:
static constexpr size_t MAX_FILESIZE = 8192;
@ -51,6 +50,7 @@ class TmStore : public SystemObject {
void calcDiffSeconds(RolloverInterval intervalUnit, uint32_t intervalCount);
void assignAndOrCreateMostRecentFile();
ReturnValue_t storePacket(PusTmReader& reader);
};
#endif /* MISSION_TMTC_TMSTOREBACKEND_H_ */