fsfw/fsfw-example-hosted
fsfw
/
fsfw-example-hosted
12
1
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

adaptions for updated fsfw code

This commit is contained in:
Robin Müller 2022-09-16 15:24:04 +02:00
parent 22ecffc30e
commit 50211e0f75
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bsp_hosted/core/ObjectFactory.cpp
View File

@ -36,11 +36,11 @@ class CfdpExampleUserHandler : public cfdp::UserBase {
} }
void fileSegmentRecvdIndication(const cfdp::FileSegmentRecvdParams& params) override {} void fileSegmentRecvdIndication(const cfdp::FileSegmentRecvdParams& params) override {}
void reportIndication(const cfdp::TransactionId& id, cfdp::StatusReportIF& report) 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 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 {} 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 {} size_t progress) override {}
void eofRecvIndication(const cfdp::TransactionId& id) override { void eofRecvIndication(const cfdp::TransactionId& id) override {
sif::info << "EOF PDU received for transaction with " << id << std::endl; 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 { class CfdpExampleFaultHandler : public cfdp::FaultHandlerBase {
public: 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 sif::warning << "Notice of suspension detected for transaction " << id
<< " with condition code: " << cfdp::getConditionCodeString(code) << std::endl; << " 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 sif::warning << "Notice of suspension detected for transaction " << id
<< " with condition code: " << cfdp::getConditionCodeString(code) << std::endl; << " 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 sif::warning << "Transaction " << id
<< " was abandoned, condition code : " << cfdp::getConditionCodeString(code) << " was abandoned, condition code : " << cfdp::getConditionCodeString(code)
<< std::endl; << 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 sif::warning << "Fault ignored for transaction " << id
<< ", condition code: " << cfdp::getConditionCodeString(code) << std::endl; << ", condition code: " << cfdp::getConditionCodeString(code) << std::endl;
} }
@ -123,7 +123,7 @@ void ObjectFactory::produce(void* args) {
UnsignedByteField<uint16_t> remoteEntityId(common::COMMON_CFDP_CLIENT_ENTITY_ID); UnsignedByteField<uint16_t> remoteEntityId(common::COMMON_CFDP_CLIENT_ENTITY_ID);
cfdp::EntityId remoteId(remoteEntityId); cfdp::EntityId remoteId(remoteEntityId);
cfdp::RemoteEntityCfg remoteCfg(remoteId); cfdp::RemoteEntityCfg remoteCfg(remoteId);
remoteCfg.defaultChecksum = cfdp::ChecksumTypes::CRC_32; remoteCfg.defaultChecksum = cfdp::ChecksumType::CRC_32;
auto* remoteCfgProvider = new cfdp::OneRemoteConfigProvider(remoteCfg); auto* remoteCfgProvider = new cfdp::OneRemoteConfigProvider(remoteCfg);
auto* cfdpUserHandler = new CfdpExampleUserHandler(*hostFs); auto* cfdpUserHandler = new CfdpExampleUserHandler(*hostFs);
auto* cfdpFaultHandler = new CfdpExampleFaultHandler(); auto* cfdpFaultHandler = new CfdpExampleFaultHandler();