tweaks for CFDP distributor
This commit is contained in:
parent
269a3052ca
commit
fdb0cc0e44
@ -2,7 +2,8 @@
|
||||
|
||||
#include "fsfw/tcdistribution/definitions.h"
|
||||
|
||||
CfdpDistributor::CfdpDistributor(CfdpRouterCfg cfg) : TcDistributorBase(cfg.objectId), cfg(cfg) {}
|
||||
CfdpDistributor::CfdpDistributor(CfdpRouterCfg cfg)
|
||||
: TcDistributorBase(cfg.objectId, cfg.tcQueue), cfg(cfg) {}
|
||||
|
||||
ReturnValue_t CfdpDistributor::registerTcDestination(const cfdp::EntityId& address,
|
||||
AcceptsTelecommandsIF& tcDest) {
|
||||
|
@ -13,14 +13,12 @@
|
||||
#include "fsfw/tmtcservices/VerificationReporter.h"
|
||||
|
||||
struct CfdpRouterCfg {
|
||||
CfdpRouterCfg(object_id_t objectId, MessageQueueIF& tmQueue, StorageManagerIF& tcStore,
|
||||
StorageManagerIF& tmStore)
|
||||
: objectId(objectId), tmQueue(tmQueue), tcStore(tcStore), tmStore(tmStore) {}
|
||||
CfdpRouterCfg(object_id_t objectId, StorageManagerIF& tcStore, MessageQueueIF* tcQueue)
|
||||
: objectId(objectId), tcStore(tcStore), tcQueue(tcQueue) {}
|
||||
|
||||
object_id_t objectId;
|
||||
MessageQueueIF& tmQueue;
|
||||
StorageManagerIF& tcStore;
|
||||
StorageManagerIF& tmStore;
|
||||
MessageQueueIF* tcQueue;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -98,7 +98,7 @@ void CcsdsDistributor::handlePacketCheckFailure(ReturnValue_t result) {
|
||||
const char* reason = "Unknown reason";
|
||||
if (result == tmtcdistrib::INVALID_CCSDS_VERSION) {
|
||||
reason = "Invalid CCSDS version";
|
||||
} else if (result == tcdistrib::INCOMPLETE_PACKET) {
|
||||
} else if (result == tmtcdistrib::INCOMPLETE_PACKET) {
|
||||
reason = "Size missmatch between CCSDS data length and packet length";
|
||||
} else if (result == tmtcdistrib::INVALID_APID) {
|
||||
reason = "No valid handler APID found";
|
||||
|
@ -145,7 +145,7 @@ ReturnValue_t PusDistributor::initialize() {
|
||||
void PusDistributor::checkerFailurePrinter() const {
|
||||
#if FSFW_VERBOSE_LEVEL >= 1
|
||||
const char* reason = "Unknown reason";
|
||||
if (tcStatus == tcdistrib::INCORRECT_CHECKSUM) {
|
||||
if (tcStatus == tmtcdistrib::INCORRECT_CHECKSUM) {
|
||||
reason = "Checksum Error";
|
||||
} else if (tcStatus == tmtcdistrib::INCORRECT_PRIMARY_HEADER) {
|
||||
reason = "Incorrect Primary Header";
|
||||
|
Loading…
Reference in New Issue
Block a user