eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 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 1 Commits 109 Files Changed 62 +5 -3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 283b897ae7 - Show all commits

4
mission/tmtc/TmStore.cpp
View File

@ -86,7 +86,9 @@ ReturnValue_t TmStore::storePacket(PusTmReader& reader) {
MessageQueueId_t TmStore::getCommandQueue() { return MessageQueueIF::NO_QUEUE; } MessageQueueId_t TmStore::getCommandQueue() { return MessageQueueIF::NO_QUEUE; }
void TmStore::calcDiffSeconds(RolloverInterval intervalUnit, uint32_t intervalCount) { void TmStore::calcDiffSeconds(RolloverInterval intervalUnit, uint32_t intervalCount) {
if (intervalUnit == RolloverInterval::HOURLY) { if (intervalUnit == RolloverInterval::MINUTELY) {
rolloverDiffSeconds = 60 * intervalCount;
} else if (intervalUnit == RolloverInterval::HOURLY) {
rolloverDiffSeconds = 60 * 60 * intervalCount; rolloverDiffSeconds = 60 * 60 * intervalCount;
} else if (intervalUnit == RolloverInterval::DAILY) { } else if (intervalUnit == RolloverInterval::DAILY) {
rolloverDiffSeconds = 60 * 60 * 24 * intervalCount; rolloverDiffSeconds = 60 * 60 * 24 * intervalCount;

4
mission/tmtc/TmStore.h
View File

@ -15,7 +15,7 @@ struct PacketFilter {
std::optional<std::vector<std::pair<uint8_t, uint8_t>>> serviceSubservices; std::optional<std::vector<std::pair<uint8_t, uint8_t>>> serviceSubservices;
}; };
enum class RolloverInterval { HOURLY, DAILY }; enum class RolloverInterval { MINUTELY, HOURLY, DAILY };
class TmStore : public SystemObject { class TmStore : public SystemObject {
public: public:
@ -41,7 +41,7 @@ class TmStore : public SystemObject {
std::string baseName; std::string baseName;
std::filesystem::path baseDir; std::filesystem::path baseDir;
uint32_t rolloverDiffSeconds = 0; uint32_t rolloverDiffSeconds = 0;
std::array<uint8_t, 8192> fileBuf{}; std::array<uint8_t, MAX_FILESIZE> fileBuf{};
timeval& currentTv; timeval& currentTv;
std::optional<timeval> mostRecentTv; std::optional<timeval> mostRecentTv;
std::optional<std::filesystem::path> mostRecentFile; std::optional<std::filesystem::path> mostRecentFile;