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

Bump FSFW #31

Merged
muellerr merged 139 commits from bump-fsfw into develop 2023-12-18 13:16:28 +01:00
Conversation 0 Commits 139 Files Changed 116 +7 -4
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6322a31566 - Show all commits

5
src/fsfw/cfdp/handler/DestHandler.cpp
View File

@ -336,7 +336,7 @@ ReturnValue_t cfdp::DestHandler::startTransaction(MetadataPduReader& reader, Met
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << "cfdp::DestHandler" << __func__ sif::warning << "cfdp::DestHandler" << __func__
<< ": No remote configuration found for destination ID " << ": No remote configuration found for destination ID "
<< tp.pduConf.sourceId.getValue() << std::endl; << transactionParams.pduConf.sourceId.getValue() << std::endl;
#endif #endif
return FAILED; return FAILED;
} }
@ -463,7 +463,8 @@ ReturnValue_t cfdp::DestHandler::checksumVerification() {
} else { } else {
// TODO: Proper error handling // TODO: Proper error handling
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << "CRC check for file " << tp.destName.data() << " failed" << std::endl; sif::warning << "CRC check for file " << transactionParams.destName.data() << " failed"
<< std::endl;
#endif #endif
transactionParams.conditionCode = ConditionCode::FILE_CHECKSUM_FAILURE; transactionParams.conditionCode = ConditionCode::FILE_CHECKSUM_FAILURE;
} }

4
src/fsfw/cfdp/handler/SourceHandler.cpp
View File

@ -82,4 +82,6 @@ ReturnValue_t cfdp::SourceHandler::checksumGeneration() {
return OK; return OK;
} }
ReturnValue_t cfdp::SourceHandler::putRequest(PutRequestFull& putRequest) { return 0; } ReturnValue_t cfdp::SourceHandler::putRequest(PutRequestFull& putRequest, RemoteEntityCfg& cfg) {
return 0;
}

2
src/fsfw/cfdp/handler/SourceHandler.h
View File

@ -31,7 +31,7 @@ class SourceHandler {
* the state machine * the state machine
* @return * @return
*/ */
ReturnValue_t putRequest(PutRequestFull& putRequest); ReturnValue_t putRequest(PutRequestFull& putRequest, RemoteEntityCfg& cfg);
void stateMachine(); void stateMachine();
private: private: