esbo_ds/fsfw
3
0
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

removed some obsolete code

Browse Source
This commit is contained in:
Robin Müller 2022-07-26 14:14:00 +02:00
parent 146a0e3828
commit f14c812aff
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ PusServiceBase::~PusServiceBase() { QueueFactory::instance()->deleteMessageQueue
ReturnValue_t PusServiceBase::performOperation(uint8_t opCode) { ReturnValue_t PusServiceBase::performOperation(uint8_t opCode) {
handleRequestQueue(); handleRequestQueue();
ReturnValue_t result = this->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 " << (uint16_t)this->serviceId << ": performService returned with "
@ -43,17 +43,7 @@ void PusServiceBase::handleRequestQueue() {
ReturnValue_t result; ReturnValue_t result;
for (uint8_t count = 0; count < PUS_SERVICE_MAX_RECEPTION; count++) { for (uint8_t count = 0; count < PUS_SERVICE_MAX_RECEPTION; count++) {
ReturnValue_t status = this->requestQueue->receiveMessage(&message); ReturnValue_t status = this->requestQueue->receiveMessage(&message);
// if(status != MessageQueueIF::EMPTY) {
#if FSFW_CPP_OSTREAM_ENABLED == 1
// sif::debug << "PusServiceBase::performOperation: Receiving from "
// << "MQ ID: " << std::hex << "0x" << std::setw(8)
// << std::setfill('0') << this->requestQueue->getId()
// << std::dec << " returned: " << status << std::setfill(' ')
// << std::endl;
#endif
// }
if (status == MessageQueueIF::EMPTY) { if (status == MessageQueueIF::EMPTY) {
status = RETURN_OK;
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