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 +3848 -4399
125 changed files with 3848 additions and 4399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 67e9dc9090 - Show all commits

4
mission/tmtc/PusTmFunnel.cpp
View File

@@ -53,8 +53,8 @@ ReturnValue_t PusTmFunnel::performOperation(uint8_t) {
CommandMessage cmdMessage; CommandMessage cmdMessage;
ReturnValue_t status = tcQueue->receiveMessage(&cmdMessage); ReturnValue_t status = tcQueue->receiveMessage(&cmdMessage);
if (status == returnvalue::OK) { if (status == returnvalue::OK) {
ReturnValue_t result = handleTcRequest(cmdMessage); ReturnValue_t result = handleTcRequest(cmdMessage);
if(result != returnvalue::OK) { if (result != returnvalue::OK) {
sif::error << "PusTmFunnel::performOperation: Error handling TC request" << std::endl; sif::error << "PusTmFunnel::performOperation: Error handling TC request" << std::endl;
} }
} }

4
mission/tmtc/PusTmFunnel.h
View File

@@ -6,12 +6,12 @@
#include <fsfw/tasks/ExecutableObjectIF.h> #include <fsfw/tasks/ExecutableObjectIF.h>
#include <fsfw/tmtcservices/AcceptsTelemetryIF.h> #include <fsfw/tmtcservices/AcceptsTelemetryIF.h>
#include <fsfw/tmtcservices/TmTcMessage.h> #include <fsfw/tmtcservices/TmTcMessage.h>
#include "fsfw/ipc/CommandMessage.h"
#include <mission/tmtc/TmFunnelBase.h> #include <mission/tmtc/TmFunnelBase.h>
#include <vector> #include <vector>
#include "PersistentTmStore.h" #include "PersistentTmStore.h"
#include "fsfw/ipc/CommandMessage.h"
#include "fsfw/timemanager/TimeReaderIF.h" #include "fsfw/timemanager/TimeReaderIF.h"
/** /**
@@ -44,7 +44,7 @@ class PusTmFunnel : public TmFunnelBase {
TmStore hkStore; TmStore hkStore;
SdCardMountedIF &sdcMan; SdCardMountedIF &sdcMan;
ReturnValue_t handleTcRequest(CommandMessage& msg); ReturnValue_t handleTcRequest(CommandMessage &msg);
ReturnValue_t handleTmPacket(TmTcMessage &message); ReturnValue_t handleTmPacket(TmTcMessage &message);
void initStoresIfPossible(bool sdCardUsable); void initStoresIfPossible(bool sdCardUsable);
ReturnValue_t initialize() override; ReturnValue_t initialize() override;

6
mission/tmtc/Service15TmStorage.cpp
View File

@@ -16,14 +16,14 @@ Service15TmStorage::Service15TmStorage(object_id_t objectId, uint16_t apid,
ReturnValue_t Service15TmStorage::isValidSubservice(uint8_t subservice) { ReturnValue_t Service15TmStorage::isValidSubservice(uint8_t subservice) {
switch (subservice) { switch (subservice) {
case (Subservices::DELETE_UP_TO):
case (Subservices::START_BY_TIME_RANGE_RETRIEVAL): { case (Subservices::START_BY_TIME_RANGE_RETRIEVAL): {
return OK; return OK;
} }
case (Subservices::DELETE_UP_TO): { default: {
return OK; return FAILED;
} }
} }
return FAILED;
} }
ReturnValue_t Service15TmStorage::getMessageQueueAndObject(uint8_t subservice, ReturnValue_t Service15TmStorage::getMessageQueueAndObject(uint8_t subservice,