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

some bugfixes

Browse Source
This commit is contained in:
Robin Müller
2022-08-09 15:09:43 +02:00
parent dba3f9960e
commit 7f9401cf63
8 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsfw/cfdp/FaultHandlerBase.cpp
View File

@ -23,7 +23,7 @@ bool FaultHandlerBase::setFaultHandler(cfdp::ConditionCode code, cfdp::FaultHand
return true;
}
bool FaultHandlerBase::faultCallback(cfdp::ConditionCode code) {
bool FaultHandlerBase::reportFault(cfdp::ConditionCode code) {
if (not faultHandlerMap.contains(code)) {
return false;
}

8
src/fsfw/cfdp/FaultHandlerBase.h
View File

@ -25,7 +25,7 @@ class FaultHandlerBase {
bool setFaultHandler(cfdp::ConditionCode code, cfdp::FaultHandlerCodes handler);
bool faultCallback(cfdp::ConditionCode code);
bool reportFault(cfdp::ConditionCode code);
virtual void noticeOfSuspensionCb(cfdp::ConditionCode code) = 0;
virtual void noticeOfCancellationCb(cfdp::ConditionCode code) = 0;
@ -33,7 +33,7 @@ class FaultHandlerBase {
virtual void ignoreCb(cfdp::ConditionCode code) = 0;
private:
etl::flat_map<cfdp::ConditionCode, cfdp::FaultHandlerCodes, 9> faultHandlerMap = {
etl::flat_map<cfdp::ConditionCode, cfdp::FaultHandlerCodes, 10> faultHandlerMap = {
etl::pair{cfdp::ConditionCode::POSITIVE_ACK_LIMIT_REACHED,
cfdp::FaultHandlerCodes::IGNORE_ERROR},
etl::pair{cfdp::ConditionCode::KEEP_ALIVE_LIMIT_REACHED,
@ -45,7 +45,9 @@ class FaultHandlerBase {
etl::pair{cfdp::ConditionCode::NAK_LIMIT_REACHED, cfdp::FaultHandlerCodes::IGNORE_ERROR},
etl::pair{cfdp::ConditionCode::INACTIVITY_DETECTED, cfdp::FaultHandlerCodes::IGNORE_ERROR},
etl::pair{cfdp::ConditionCode::UNSUPPORTED_CHECKSUM_TYPE,
cfdp::FaultHandlerCodes::IGNORE_ERROR}};
cfdp::FaultHandlerCodes::IGNORE_ERROR},
etl::pair{cfdp::ConditionCode::FILESTORE_REJECTION, cfdp::FaultHandlerCodes::IGNORE_ERROR},
etl::pair{cfdp::ConditionCode::CHECK_LIMIT_REACHED, cfdp::FaultHandlerCodes::IGNORE_ERROR}};
};
} // namespace cfdp