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

Merge branch 'development' into mueller/new-cicd-cmake-opts

Browse Source
This commit is contained in:
Robin Müller 2022-06-20 09:39:58 +02:00
commit fce95e04a8
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/fsfw/osal/rtems/MessageQueue.h
View File

@ -55,8 +55,7 @@ class MessageQueue : public MessageQueueBase {
ReturnValue_t receiveMessage(MessageQueueMessageIF* message) override; ReturnValue_t receiveMessage(MessageQueueMessageIF* message) override;
ReturnValue_t sendMessageFrom(MessageQueueId_t sendTo, MessageQueueMessageIF* message, ReturnValue_t sendMessageFrom(MessageQueueId_t sendTo, MessageQueueMessageIF* message,
MessageQueueId_t sentFrom, MessageQueueId_t sentFrom, bool ignoreFault) override;
bool ignoreFault) override;
private: private:
/** /**

7
src/fsfw/pus/Service11TelecommandScheduling.tpp
View File

@ -620,16 +620,15 @@ inline void Service11TelecommandScheduling<MAX_NUM_TCS>::debugPrintMultimapConte
sif::debug << "Service11TelecommandScheduling::debugPrintMultimapContent: Multimap Content" sif::debug << "Service11TelecommandScheduling::debugPrintMultimapContent: Multimap Content"
<< std::endl; << std::endl;
#else #else
sif::printDebug( sif::printDebug("Service11TelecommandScheduling::debugPrintMultimapContent: Multimap Content\n");
"Service11TelecommandScheduling::debugPrintMultimapContent: Multimap Content\n");
#endif #endif
for (const auto &dit : telecommandMap) { for (const auto &dit : telecommandMap) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::debug << "[" << dit.first << "]: Request ID: " << dit.second.requestId << " | " sif::debug << "[" << dit.first << "]: Request ID: " << dit.second.requestId << " | "
<< "Store Address: " << dit.second.storeAddr.raw << std::endl; << "Store Address: " << dit.second.storeAddr.raw << std::endl;
#else #else
sif::printDebug("[%d]: Request ID: %d | Store Address: %d\n", dit.first, sif::printDebug("[%d]: Request ID: %d | Store Address: %d\n", dit.first, dit.second.requestId,
dit.second.requestId, dit.second.storeAddr); dit.second.storeAddr);
#endif #endif
} }
#endif #endif