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

adaptions for enum renaming

This commit is contained in:
Robin Müller 2022-09-15 16:47:09 +02:00
parent 36ca35da77
commit 753d5ff39e
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,7 +206,7 @@ ReturnValue_t cfdp::DestHandler::handleEofPdu(const cfdp::PacketInfo& info) {
return result; return result;
} }
// TODO: Error handling // TODO: Error handling
if (eofInfo.getConditionCode() == ConditionCode::NO_ERROR) { if (eofInfo.getConditionCode() == ConditionCodes::NO_ERROR) {
tp.crc = eofInfo.getChecksum(); tp.crc = eofInfo.getChecksum();
uint64_t fileSizeFromEof = eofInfo.getFileSize().value(); uint64_t fileSizeFromEof = eofInfo.getFileSize().value();
// CFDP 4.6.1.2.9: Declare file size error if progress exceeds file size // CFDP 4.6.1.2.9: Declare file size error if progress exceeds file size
@ -345,7 +345,7 @@ ReturnValue_t cfdp::DestHandler::handleTransferCompletion() {
// TODO: Warning / error handling? // TODO: Warning / error handling?
} }
} else { } else {
tp.conditionCode = ConditionCode::NO_ERROR; tp.conditionCode = ConditionCodes::NO_ERROR;
} }
result = noticeOfCompletion(); result = noticeOfCompletion();
if (result != OK) { if (result != OK) {
@ -398,14 +398,14 @@ ReturnValue_t cfdp::DestHandler::checksumVerification() {
uint32_t value = crcCalc.value(); uint32_t value = crcCalc.value();
if (value == tp.crc) { if (value == tp.crc) {
tp.conditionCode = ConditionCode::NO_ERROR; tp.conditionCode = ConditionCodes::NO_ERROR;
tp.deliveryCode = FileDeliveryCode::DATA_COMPLETE; tp.deliveryCode = FileDeliveryCode::DATA_COMPLETE;
} 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 " << tp.destName.data() << " failed" << std::endl;
#endif #endif
tp.conditionCode = ConditionCode::FILE_CHECKSUM_FAILURE; tp.conditionCode = ConditionCodes::FILE_CHECKSUM_FAILURE;
} }
return OK; return OK;
} }

4
src/fsfw/cfdp/handler/DestHandler.h
View File

@ -150,7 +150,7 @@ class DestHandler {
std::fill(sourceName.begin(), sourceName.end(), '\0'); std::fill(sourceName.begin(), sourceName.end(), '\0');
std::fill(destName.begin(), destName.end(), '\0'); std::fill(destName.begin(), destName.end(), '\0');
fileSize.setFileSize(0, false); fileSize.setFileSize(0, false);
conditionCode = ConditionCode::NO_ERROR; conditionCode = ConditionCodes::NO_ERROR;
deliveryCode = FileDeliveryCode::DATA_INCOMPLETE; deliveryCode = FileDeliveryCode::DATA_INCOMPLETE;
deliveryStatus = FileDeliveryStatus::DISCARDED_DELIBERATELY; deliveryStatus = FileDeliveryStatus::DISCARDED_DELIBERATELY;
crc = 0; crc = 0;
@ -167,7 +167,7 @@ class DestHandler {
cfdp::FileSize fileSize; cfdp::FileSize fileSize;
TransactionId transactionId; TransactionId transactionId;
PduConfig pduConf; PduConfig pduConf;
ConditionCode conditionCode = ConditionCode::NO_ERROR; ConditionCodes conditionCode = ConditionCodes::NO_ERROR;
FileDeliveryCode deliveryCode = FileDeliveryCode::DATA_INCOMPLETE; FileDeliveryCode deliveryCode = FileDeliveryCode::DATA_INCOMPLETE;
FileDeliveryStatus deliveryStatus = FileDeliveryStatus::DISCARDED_DELIBERATELY; FileDeliveryStatus deliveryStatus = FileDeliveryStatus::DISCARDED_DELIBERATELY;
uint32_t crc = 0; uint32_t crc = 0;