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

some printout fixes

Browse Source
This commit is contained in:
Robin Müller 2022-07-27 10:49:49 +02:00
parent 681738dcc6
commit 9eb652e585
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/fsfw/tcdistribution/PusDistributor.cpp
View File

@ -1,5 +1,6 @@
#include "fsfw/tcdistribution/PusDistributor.h" #include "fsfw/tcdistribution/PusDistributor.h"
#include "definitions.h"
#include "fsfw/objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "fsfw/tcdistribution/CCSDSDistributorIF.h" #include "fsfw/tcdistribution/CCSDSDistributorIF.h"
@ -42,15 +43,15 @@ PusDistributor::TcMqMapIter PusDistributor::selectDestination() {
if (tcStatus != HasReturnvaluesIF::RETURN_OK) { if (tcStatus != HasReturnvaluesIF::RETURN_OK) {
#if FSFW_VERBOSE_LEVEL >= 1 #if FSFW_VERBOSE_LEVEL >= 1
const char* keyword = "unnamed error"; const char* keyword = "unnamed error";
if (tcStatus == TcPacketCheckPUS::INCORRECT_CHECKSUM) { if (tcStatus == tcdistrib::INCORRECT_CHECKSUM) {
keyword = "checksum"; keyword = "checksum";
} else if (tcStatus == TcPacketCheckPUS::INCORRECT_PRIMARY_HEADER) { } else if (tcStatus == tcdistrib::INCORRECT_PRIMARY_HEADER) {
keyword = "incorrect primary header"; keyword = "incorrect primary header";
} else if (tcStatus == TcPacketCheckPUS::ILLEGAL_APID) { } else if (tcStatus == tcdistrib::INVALID_APID) {
keyword = "illegal APID"; keyword = "illegal APID";
} else if (tcStatus == TcPacketCheckPUS::INCORRECT_SECONDARY_HEADER) { } else if (tcStatus == tcdistrib::INCORRECT_SECONDARY_HEADER) {
keyword = "incorrect secondary header"; keyword = "incorrect secondary header";
} else if (tcStatus == TcPacketCheckPUS::INCOMPLETE_PACKET) { } else if (tcStatus == tcdistrib::INCOMPLETE_PACKET) {
keyword = "incomplete packet"; keyword = "incomplete packet";
} }
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1

6
src/fsfw/tmtcservices/PusServiceBase.cpp
View File

@ -26,8 +26,8 @@ ReturnValue_t PusServiceBase::performOperation(uint8_t opCode) {
ReturnValue_t result = performService(); ReturnValue_t result = performService();
if (result != RETURN_OK) { if (result != RETURN_OK) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "PusService " << (uint16_t)this->serviceId << ": performService returned with " sif::error << "PusService " << psbParams.serviceId << ": performService returned with "
<< (int16_t)result << std::endl; << static_cast<uint16_t>(result) << std::endl;
#endif #endif
return RETURN_FAILED; return RETURN_FAILED;
} }
@ -45,7 +45,7 @@ void PusServiceBase::handleRequestQueue() {
break; break;
} else if (status != HasReturnvaluesIF::RETURN_OK) { } else if (status != HasReturnvaluesIF::RETURN_OK) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "PusServiceBase::performOperation: Service " << this->serviceId sif::error << "PusServiceBase::performOperation: Service " << psbParams.serviceId
<< ": Error receiving packet. Code: " << std::hex << status << std::dec << ": Error receiving packet. Code: " << std::hex << status << std::dec
<< std::endl; << std::endl;
#else #else