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

some tweaks

Browse Source
This commit is contained in:
Robin Müller 2021-01-29 17:16:34 +01:00
parent bc722b5583
commit 484f9b6b37
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pus/Service17Test.cpp
View File

@ -15,7 +15,7 @@ Service17Test::~Service17Test() {
} }
ReturnValue_t Service17Test::handleRequest(uint8_t subservice) { ReturnValue_t Service17Test::handleRequest(uint8_t subservice) {
switch(subservice){ switch(subservice) {
case Subservice::CONNECTION_TEST: { case Subservice::CONNECTION_TEST: {
TmPacketStored connectionPacket(apid, serviceId, TmPacketStored connectionPacket(apid, serviceId,
Subservice::CONNECTION_TEST_REPORT, packetSubCounter++); Subservice::CONNECTION_TEST_REPORT, packetSubCounter++);

18
tmtcservices/TmTcBridge.cpp
View File

@ -1,7 +1,7 @@
#include "TmTcBridge.h" #include "TmTcBridge.h"
#include "../ipc/QueueFactory.h" #include "../ipc/QueueFactory.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterface.h"
#include "../globalfunctions/arrayprinter.h" #include "../globalfunctions/arrayprinter.h"
TmTcBridge::TmTcBridge(object_id_t objectId, object_id_t tcDestination, TmTcBridge::TmTcBridge(object_id_t objectId, object_id_t tcDestination,
@ -109,9 +109,8 @@ ReturnValue_t TmTcBridge::handleTm() {
ReturnValue_t result = handleTmQueue(); ReturnValue_t result = handleTmQueue();
if(result != RETURN_OK) { if(result != RETURN_OK) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "TmTcBridge::handleTm: Error handling TM queue with " sif::error << "TmTcBridge::handleTm: Error handling TM queue with error code 0x" <<
<< "error code 0x" << std::hex << result << std::dec std::hex << result << std::dec << "!" << std::endl;
<< "!" << std::endl;
#endif #endif
status = result; status = result;
} }
@ -121,8 +120,7 @@ ReturnValue_t TmTcBridge::handleTm() {
result = handleStoredTm(); result = handleStoredTm();
if(result != RETURN_OK) { if(result != RETURN_OK) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "TmTcBridge::handleTm: Error handling stored TMs!" sif::error << "TmTcBridge::handleTm: Error handling stored TMs!" << std::endl;
<< std::endl;
#endif #endif
status = result; status = result;
} }
@ -140,9 +138,15 @@ ReturnValue_t TmTcBridge::handleTmQueue() {
result == HasReturnvaluesIF::RETURN_OK; result == HasReturnvaluesIF::RETURN_OK;
result = tmTcReceptionQueue->receiveMessage(&message)) result = tmTcReceptionQueue->receiveMessage(&message))
{ {
#if FSFW_VERBOSE_LEVEL >= 3
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
//sif::info << (int) packetSentCounter << std::endl; sif::info << "Sent packet counter: " << static_cast<int>(packetSentCounter) << std::endl;
#else
sif::printInfo("Sent packet counter: %d\n", packetSentCounter);
#endif #endif
#endif /* FSFW_VERBOSE_LEVEL >= 3 */
if(communicationLinkUp == false or if(communicationLinkUp == false or
packetSentCounter >= sentPacketsPerCycle) { packetSentCounter >= sentPacketsPerCycle) {
storeDownlinkData(&message); storeDownlinkData(&message);