some printout fixes
This commit is contained in:
parent
681738dcc6
commit
9eb652e585
@ -1,5 +1,6 @@
|
||||
#include "fsfw/tcdistribution/PusDistributor.h"
|
||||
|
||||
#include "definitions.h"
|
||||
#include "fsfw/objectmanager/ObjectManager.h"
|
||||
#include "fsfw/serviceinterface/ServiceInterface.h"
|
||||
#include "fsfw/tcdistribution/CCSDSDistributorIF.h"
|
||||
@ -42,15 +43,15 @@ PusDistributor::TcMqMapIter PusDistributor::selectDestination() {
|
||||
if (tcStatus != HasReturnvaluesIF::RETURN_OK) {
|
||||
#if FSFW_VERBOSE_LEVEL >= 1
|
||||
const char* keyword = "unnamed error";
|
||||
if (tcStatus == TcPacketCheckPUS::INCORRECT_CHECKSUM) {
|
||||
if (tcStatus == tcdistrib::INCORRECT_CHECKSUM) {
|
||||
keyword = "checksum";
|
||||
} else if (tcStatus == TcPacketCheckPUS::INCORRECT_PRIMARY_HEADER) {
|
||||
} else if (tcStatus == tcdistrib::INCORRECT_PRIMARY_HEADER) {
|
||||
keyword = "incorrect primary header";
|
||||
} else if (tcStatus == TcPacketCheckPUS::ILLEGAL_APID) {
|
||||
} else if (tcStatus == tcdistrib::INVALID_APID) {
|
||||
keyword = "illegal APID";
|
||||
} else if (tcStatus == TcPacketCheckPUS::INCORRECT_SECONDARY_HEADER) {
|
||||
} else if (tcStatus == tcdistrib::INCORRECT_SECONDARY_HEADER) {
|
||||
keyword = "incorrect secondary header";
|
||||
} else if (tcStatus == TcPacketCheckPUS::INCOMPLETE_PACKET) {
|
||||
} else if (tcStatus == tcdistrib::INCOMPLETE_PACKET) {
|
||||
keyword = "incomplete packet";
|
||||
}
|
||||
#if FSFW_CPP_OSTREAM_ENABLED == 1
|
||||
|
@ -26,8 +26,8 @@ ReturnValue_t PusServiceBase::performOperation(uint8_t opCode) {
|
||||
ReturnValue_t result = performService();
|
||||
if (result != RETURN_OK) {
|
||||
#if FSFW_CPP_OSTREAM_ENABLED == 1
|
||||
sif::error << "PusService " << (uint16_t)this->serviceId << ": performService returned with "
|
||||
<< (int16_t)result << std::endl;
|
||||
sif::error << "PusService " << psbParams.serviceId << ": performService returned with "
|
||||
<< static_cast<uint16_t>(result) << std::endl;
|
||||
#endif
|
||||
return RETURN_FAILED;
|
||||
}
|
||||
@ -45,7 +45,7 @@ void PusServiceBase::handleRequestQueue() {
|
||||
break;
|
||||
} else if (status != HasReturnvaluesIF::RETURN_OK) {
|
||||
#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
|
||||
<< std::endl;
|
||||
#else
|
||||
|
Loading…
Reference in New Issue
Block a user