KSat/fsfw
19
6
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

FSFW Update #28

Merged
jgerhards merged 782 commits from fsfw_update into develop 2023-05-28 23:43:22 +02:00
Conversation 0 Commits 782 Files Changed 960 +17152 -12211
943 changed files with 17152 additions and 12211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a236a5ec50 - Show all commits

2
src/fsfw/tmtcservices/TmTcBridge.cpp
View File

@@ -240,7 +240,7 @@ void TmTcBridge::registerCommDisconnect() {
} }
} }
MessageQueueId_t TmTcBridge::getReportReceptionQueue(uint8_t virtualChannel) { MessageQueueId_t TmTcBridge::getReportReceptionQueue(uint8_t virtualChannel) const {
return tmTcReceptionQueue->getId(); return tmTcReceptionQueue->getId();
} }

2
src/fsfw/tmtcservices/TmTcBridge.h
View File

@@ -65,7 +65,7 @@ class TmTcBridge : public AcceptsTelemetryIF,
ReturnValue_t performOperation(uint8_t operationCode = 0) override; ReturnValue_t performOperation(uint8_t operationCode = 0) override;
/** AcceptsTelemetryIF override */ /** AcceptsTelemetryIF override */
MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) override; MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel) const override;
/** AcceptsTelecommandsIF override */ /** AcceptsTelecommandsIF override */
uint32_t getIdentifier() const override; uint32_t getIdentifier() const override;