From 50211e0f75c4a1521b26a5732c9fc1474bc67d88 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 16 Sep 2022 15:24:04 +0200 Subject: [PATCH] adaptions for updated fsfw code --- bsp_hosted/core/ObjectFactory.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bsp_hosted/core/ObjectFactory.cpp b/bsp_hosted/core/ObjectFactory.cpp index 6536e50..ee1c188 100644 --- a/bsp_hosted/core/ObjectFactory.cpp +++ b/bsp_hosted/core/ObjectFactory.cpp @@ -36,11 +36,11 @@ class CfdpExampleUserHandler : public cfdp::UserBase { } void fileSegmentRecvdIndication(const cfdp::FileSegmentRecvdParams& params) override {} void reportIndication(const cfdp::TransactionId& id, cfdp::StatusReportIF& report) override {} - void suspendedIndication(const cfdp::TransactionId& id, cfdp::ConditionCodes code) override {} + void suspendedIndication(const cfdp::TransactionId& id, cfdp::ConditionCode code) override {} void resumedIndication(const cfdp::TransactionId& id, size_t progress) override {} - void faultIndication(const cfdp::TransactionId& id, cfdp::ConditionCodes code, + void faultIndication(const cfdp::TransactionId& id, cfdp::ConditionCode code, size_t progress) override {} - void abandonedIndication(const cfdp::TransactionId& id, cfdp::ConditionCodes code, + void abandonedIndication(const cfdp::TransactionId& id, cfdp::ConditionCode code, size_t progress) override {} void eofRecvIndication(const cfdp::TransactionId& id) override { sif::info << "EOF PDU received for transaction with " << id << std::endl; @@ -49,20 +49,20 @@ class CfdpExampleUserHandler : public cfdp::UserBase { class CfdpExampleFaultHandler : public cfdp::FaultHandlerBase { public: - void noticeOfSuspensionCb(cfdp::TransactionId& id, cfdp::ConditionCodes code) override { + void noticeOfSuspensionCb(cfdp::TransactionId& id, cfdp::ConditionCode code) override { sif::warning << "Notice of suspension detected for transaction " << id << " with condition code: " << cfdp::getConditionCodeString(code) << std::endl; } - void noticeOfCancellationCb(cfdp::TransactionId& id, cfdp::ConditionCodes code) override { + void noticeOfCancellationCb(cfdp::TransactionId& id, cfdp::ConditionCode code) override { sif::warning << "Notice of suspension detected for transaction " << id << " with condition code: " << cfdp::getConditionCodeString(code) << std::endl; } - void abandonCb(cfdp::TransactionId& id, cfdp::ConditionCodes code) override { + void abandonCb(cfdp::TransactionId& id, cfdp::ConditionCode code) override { sif::warning << "Transaction " << id << " was abandoned, condition code : " << cfdp::getConditionCodeString(code) << std::endl; } - void ignoreCb(cfdp::TransactionId& id, cfdp::ConditionCodes code) override { + void ignoreCb(cfdp::TransactionId& id, cfdp::ConditionCode code) override { sif::warning << "Fault ignored for transaction " << id << ", condition code: " << cfdp::getConditionCodeString(code) << std::endl; } @@ -123,7 +123,7 @@ void ObjectFactory::produce(void* args) { UnsignedByteField remoteEntityId(common::COMMON_CFDP_CLIENT_ENTITY_ID); cfdp::EntityId remoteId(remoteEntityId); cfdp::RemoteEntityCfg remoteCfg(remoteId); - remoteCfg.defaultChecksum = cfdp::ChecksumTypes::CRC_32; + remoteCfg.defaultChecksum = cfdp::ChecksumType::CRC_32; auto* remoteCfgProvider = new cfdp::OneRemoteConfigProvider(remoteCfg); auto* cfdpUserHandler = new CfdpExampleUserHandler(*hostFs); auto* cfdpFaultHandler = new CfdpExampleFaultHandler();