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

better naming
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-08-14 21:06:49 +02:00
parent 360911e5eb
commit d2ae8e9362
Signed by: muellerr
GPG Key ID: FCE0B2BD2195142F
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsfw

@ -1 +1 @@
Subproject commit 60dcacf432aa0a7b739f8fdf8bf4aaa37ac614e5 Subproject commit cb1aaea6cd10f34bf46adf8f91f86af1fb42041a

12
mission/cfdp/CfdpHandler.cpp
View File

@ -11,7 +11,7 @@ using namespace cfdp;
CfdpHandler::CfdpHandler(const FsfwHandlerParams& fsfwHandlerParams, const CfdpHandlerCfg& cfdpCfg) CfdpHandler::CfdpHandler(const FsfwHandlerParams& fsfwHandlerParams, const CfdpHandlerCfg& cfdpCfg)
: SystemObject(fsfwHandlerParams.objectId), : SystemObject(fsfwHandlerParams.objectId),
tmtcQueue(fsfwHandlerParams.tmtcQueue), pduQueue(fsfwHandlerParams.tmtcQueue),
cfdpRequestQueue(fsfwHandlerParams.cfdpQueue), cfdpRequestQueue(fsfwHandlerParams.cfdpQueue),
localCfg(cfdpCfg.id, cfdpCfg.indicCfg, cfdpCfg.faultHandler), localCfg(cfdpCfg.id, cfdpCfg.indicCfg, cfdpCfg.faultHandler),
fsfwParams(fsfwHandlerParams.packetDest, &fsfwHandlerParams.tmtcQueue, this, fsfwParams(fsfwHandlerParams.packetDest, &fsfwHandlerParams.tmtcQueue, this,
@ -28,7 +28,7 @@ CfdpHandler::CfdpHandler(const FsfwHandlerParams& fsfwHandlerParams, const CfdpH
return destHandler.getDestHandlerParams().cfg.localId.getValue(); return destHandler.getDestHandlerParams().cfg.localId.getValue();
} }
[[nodiscard]] MessageQueueId_t CfdpHandler::getRequestQueue() const { return tmtcQueue.getId(); } [[nodiscard]] MessageQueueId_t CfdpHandler::getRequestQueue() const { return pduQueue.getId(); }
ReturnValue_t CfdpHandler::initialize() { ReturnValue_t CfdpHandler::initialize() {
ReturnValue_t result = destHandler.initialize(); ReturnValue_t result = destHandler.initialize();
@ -47,9 +47,9 @@ ReturnValue_t CfdpHandler::performOperation(uint8_t operationCode) {
ReturnValue_t status; ReturnValue_t status;
ReturnValue_t result = OK; ReturnValue_t result = OK;
TmTcMessage tmtcMsg; TmTcMessage tmtcMsg;
for (status = tmtcQueue.receiveMessage(&tmtcMsg); status == returnvalue::OK; for (status = pduQueue.receiveMessage(&tmtcMsg); status == returnvalue::OK;
status = tmtcQueue.receiveMessage(&tmtcMsg)) { status = pduQueue.receiveMessage(&tmtcMsg)) {
result = handleCfdpPacket(tmtcMsg); result = handlePduPacket(tmtcMsg);
if (result != OK) { if (result != OK) {
status = result; status = result;
} }
@ -67,7 +67,7 @@ ReturnValue_t CfdpHandler::performOperation(uint8_t operationCode) {
return status; return status;
} }
ReturnValue_t CfdpHandler::handleCfdpPacket(TmTcMessage& msg) { ReturnValue_t CfdpHandler::handlePduPacket(TmTcMessage& msg) {
auto accessorPair = tcStore->getData(msg.getStorageId()); auto accessorPair = tcStore->getData(msg.getStorageId());
if (accessorPair.first != OK) { if (accessorPair.first != OK) {
return accessorPair.first; return accessorPair.first;

4
mission/cfdp/CfdpHandler.h
View File

@ -66,7 +66,7 @@ class CfdpHandler : public SystemObject, public ExecutableObjectIF, public Accep
ReturnValue_t performOperation(uint8_t operationCode) override; ReturnValue_t performOperation(uint8_t operationCode) override;
private: private:
MessageQueueIF& tmtcQueue; MessageQueueIF& pduQueue;
MessageQueueIF& cfdpRequestQueue; MessageQueueIF& cfdpRequestQueue;
cfdp::LocalEntityCfg localCfg; cfdp::LocalEntityCfg localCfg;
cfdp::FsfwParams fsfwParams; cfdp::FsfwParams fsfwParams;
@ -77,7 +77,7 @@ class CfdpHandler : public SystemObject, public ExecutableObjectIF, public Accep
StorageManagerIF* tcStore = nullptr; StorageManagerIF* tcStore = nullptr;
StorageManagerIF* tmStore = nullptr; StorageManagerIF* tmStore = nullptr;
ReturnValue_t handleCfdpPacket(TmTcMessage& msg); ReturnValue_t handlePduPacket(TmTcMessage& msg);
}; };
#endif // FSFW_EXAMPLE_HOSTED_CFDPHANDLER_H #endif // FSFW_EXAMPLE_HOSTED_CFDPHANDLER_H