eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-02-20 20:03:09 +01:00
commit 124e08e80b
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -20,6 +20,7 @@ change warranting a new major release:
## Fixed ## Fixed
- CFDP Funnel bugfix: CCSDS wrapping was buggy and works properly now. - CFDP Funnel bugfix: CCSDS wrapping was buggy and works properly now.
- CMakeLists.txt fix which broke CI/CD builds when server could not retrieve full git SHA.
## Changed ## Changed

6
mission/tmtc/CfdpTmFunnel.cpp
View File

@ -56,8 +56,7 @@ ReturnValue_t CfdpTmFunnel::handlePacket(TmTcMessage& msg) {
size_t packetLen = 0; size_t packetLen = 0;
uint8_t* serPtr = newPacketData; uint8_t* serPtr = newPacketData;
result = result = spacePacketHeader.serializeBe(&serPtr, &packetLen, spacePacketHeader.getFullPacketLen());
spacePacketHeader.serializeBe(&serPtr, &packetLen, spacePacketHeader.getFullPacketLen());
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "CfdpTmFunnel::handlePacket: Error serializing packet" << std::endl; sif::error << "CfdpTmFunnel::handlePacket: Error serializing packet" << std::endl;
@ -84,7 +83,8 @@ ReturnValue_t CfdpTmFunnel::handlePacket(TmTcMessage& msg) {
} else { } else {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "PusTmFunnel::handlePacket: Store too full to create data copy or store " sif::error << "PusTmFunnel::handlePacket: Store too full to create data copy or store "
"error" << std::endl; "error"
<< std::endl;
#endif #endif
break; break;
} }