fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

Allow passing a MqArgs struct to the MQ creation #583

Merged
mohr merged 12 commits from eive/fsfw:mueller/ipc-pass-arbitrary-args-to-mq into development 2022-04-25 14:43:53 +02:00
Conversation 2 Commits 12 Files Changed 22 +4 -4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 95f018a0b0 - Show all commits

4
src/fsfw/ipc/MessageQueueBase.cpp
View File

@ -37,8 +37,8 @@ MessageQueueId_t MessageQueueBase::getId() const {
return id; return id;
} }
MqArgs* MessageQueueBase::getMqArgs() { MqArgs& MessageQueueBase::getMqArgs() {
return &args; return args;
} }
void MessageQueueBase::setDefaultDestination(MessageQueueId_t defaultDestination) { void MessageQueueBase::setDefaultDestination(MessageQueueId_t defaultDestination) {

2
src/fsfw/ipc/MessageQueueBase.h
View File

@ -12,7 +12,7 @@ public:
// Default implementations for MessageQueueIF where possible // Default implementations for MessageQueueIF where possible
virtual MessageQueueId_t getLastPartner() const override; virtual MessageQueueId_t getLastPartner() const override;
virtual MessageQueueId_t getId() const override; virtual MessageQueueId_t getId() const override;
virtual MqArgs* getMqArgs() override; virtual MqArgs& getMqArgs() override;
virtual void setDefaultDestination(MessageQueueId_t defaultDestination) override; virtual void setDefaultDestination(MessageQueueId_t defaultDestination) override;
virtual MessageQueueId_t getDefaultDestination() const override; virtual MessageQueueId_t getDefaultDestination() const override;
virtual bool isDefaultDestinationSet() const override; virtual bool isDefaultDestinationSet() const override;

2
src/fsfw/ipc/MessageQueueIF.h
View File

@ -161,7 +161,7 @@ class MessageQueueIF {
virtual bool isDefaultDestinationSet() const = 0; virtual bool isDefaultDestinationSet() const = 0;
virtual MqArgs* getMqArgs() = 0; virtual MqArgs& getMqArgs() = 0;
}; };
#endif /* FSFW_IPC_MESSAGEQUEUEIF_H_ */ #endif /* FSFW_IPC_MESSAGEQUEUEIF_H_ */