eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Merge branch 'mueller/refactor-tmtc-stack' into mueller/cfdp-routers

Browse Source
This commit is contained in:
Robin Müller 2022-08-22 16:24:20 +02:00
commit 9e5dddf79c
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
9 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fsfw/tcdistribution/PusDistributor.cpp
View File

@ -101,7 +101,7 @@ ReturnValue_t PusDistributor::callbackAfterSending(ReturnValue_t queueStatus) {
if (queueStatus != returnvalue::OK) { if (queueStatus != returnvalue::OK) {
tcStatus = queueStatus; tcStatus = queueStatus;
} }
if (tcStatus != RETURN_OK) { if (tcStatus != returnvalue::OK) {
verifyChannel->sendFailureReport({tcverif::ACCEPTANCE_FAILURE, reader, tcStatus}); verifyChannel->sendFailureReport({tcverif::ACCEPTANCE_FAILURE, reader, tcStatus});
// A failed packet is deleted immediately after reporting, // A failed packet is deleted immediately after reporting,
// otherwise it will block memory. // otherwise it will block memory.
@ -109,7 +109,7 @@ ReturnValue_t PusDistributor::callbackAfterSending(ReturnValue_t queueStatus) {
return returnvalue::FAILED; return returnvalue::FAILED;
} else { } else {
verifyChannel->sendSuccessReport({tcverif::ACCEPTANCE_SUCCESS, reader}); verifyChannel->sendSuccessReport({tcverif::ACCEPTANCE_SUCCESS, reader});
return RETURN_OK; return returnvalue::OK;
} }
} }

2
src/fsfw/tcdistribution/PusPacketChecker.h
View File

@ -2,7 +2,7 @@
#define FSFW_TCDISTRIBUTION_TCPACKETCHECKPUS_H_ #define FSFW_TCDISTRIBUTION_TCPACKETCHECKPUS_H_
#include "fsfw/FSFW.h" #include "fsfw/FSFW.h"
#include "fsfw/returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/returnvalue.h"
#include "fsfw/tmtcpacket/pus/defs.h" #include "fsfw/tmtcpacket/pus/defs.h"
#include "fsfw/tmtcservices/PusVerificationReport.h" #include "fsfw/tmtcservices/PusVerificationReport.h"

1
src/fsfw/tcdistribution/TcPacketCheckCFDP.cpp
View File

@ -9,4 +9,3 @@ ReturnValue_t CfdpPacketChecker::checkPacket(const SpacePacketReader& currentPac
} }
uint16_t CfdpPacketChecker::getApid() const { return apid; } uint16_t CfdpPacketChecker::getApid() const { return apid; }

2
src/fsfw/tcdistribution/definitions.h
View File

@ -6,7 +6,7 @@
#include "fsfw/events/Event.h" #include "fsfw/events/Event.h"
#include "fsfw/events/fwSubsystemIdRanges.h" #include "fsfw/events/fwSubsystemIdRanges.h"
#include "fsfw/returnvalues/FwClassIds.h" #include "fsfw/returnvalues/FwClassIds.h"
#include "fsfw/returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/returnvalue.h"
namespace tmtcdistrib { namespace tmtcdistrib {
static const uint8_t INTERFACE_ID = CLASS_ID::TMTC_DISTRIBUTION; static const uint8_t INTERFACE_ID = CLASS_ID::TMTC_DISTRIBUTION;

2
src/fsfw/timemanager/TimeReaderIF.h
View File

@ -4,7 +4,7 @@
#include <cstdlib> #include <cstdlib>
#include "TimeStampIF.h" #include "TimeStampIF.h"
#include "fsfw/returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/returnvalue.h"
class TimeReaderIF : public TimeStampIF { class TimeReaderIF : public TimeStampIF {
public: public:

2
src/fsfw/tmtcpacket/ccsds/SpacePacketReader.h
View File

@ -3,7 +3,7 @@
#include <cstddef> #include <cstddef>
#include "fsfw/returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/returnvalue.h"
#include "fsfw/tmtcpacket/ReadablePacketIF.h" #include "fsfw/tmtcpacket/ReadablePacketIF.h"
#include "fsfw/tmtcpacket/RedirectableDataPointerIF.h" #include "fsfw/tmtcpacket/RedirectableDataPointerIF.h"
#include "fsfw/tmtcpacket/ccsds/defs.h" #include "fsfw/tmtcpacket/ccsds/defs.h"

2
src/fsfw/tmtcpacket/pus/tm/PusTmMinimal.h
View File

@ -2,7 +2,7 @@
#define FRAMEWORK_TMTCPACKET_PUS_TMPACKETMINIMAL_H_ #define FRAMEWORK_TMTCPACKET_PUS_TMPACKETMINIMAL_H_
#include "PusTmIF.h" #include "PusTmIF.h"
#include "fsfw/returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/returnvalue.h"
#include "fsfw/tmtcpacket/ccsds/SpacePacketReader.h" #include "fsfw/tmtcpacket/ccsds/SpacePacketReader.h"
#include "fsfw/tmtcpacket/pus/RawUserDataReaderIF.h" #include "fsfw/tmtcpacket/pus/RawUserDataReaderIF.h"

2
src/fsfw/tmtcservices/TmSendHelper.h
View File

@ -5,7 +5,7 @@
#include "fsfw/internalerror/InternalErrorReporterIF.h" #include "fsfw/internalerror/InternalErrorReporterIF.h"
#include "fsfw/ipc/MessageQueueIF.h" #include "fsfw/ipc/MessageQueueIF.h"
#include "fsfw/ipc/messageQueueDefinitions.h" #include "fsfw/ipc/messageQueueDefinitions.h"
#include "fsfw/returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/returnvalue.h"
class TmSendHelper { class TmSendHelper {
public: public:

2
src/fsfw/tmtcservices/tcHelpers.h
View File

@ -1,7 +1,7 @@
#ifndef FSFW_TMTCSERVICES_TCHELPERS_H #ifndef FSFW_TMTCSERVICES_TCHELPERS_H
#define FSFW_TMTCSERVICES_TCHELPERS_H #define FSFW_TMTCSERVICES_TCHELPERS_H
#include "fsfw/returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/returnvalue.h"
#include "fsfw/storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
#include "fsfw/tmtcpacket/pus/tc.h" #include "fsfw/tmtcpacket/pus/tc.h"