eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

v1.15.0 #311

Merged
muellerr merged 107 commits from develop into main 2022-10-27 11:28:49 +02:00
Conversation 0 Commits 107 Files Changed 81 +9 -9
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 22d4d7085d - Show all commits

2
fsfw

@ -1 +1 @@
Subproject commit 73454c629c042de8efe7aa4fa6dcbf1e184b0961 Subproject commit 2de9e25cebd3b0cfdac538b5c4dd88e0274ebbac

4
mission/tmtc/CCSDSHandler.cpp
View File

@ -180,9 +180,9 @@ void CCSDSHandler::addVirtualChannel(VcId_t vcId, VirtualChannel* virtualChannel
} }
} }
MessageQueueId_t CCSDSHandler::getReportReceptionQueue(uint8_t virtualChannel) { MessageQueueId_t CCSDSHandler::getReportReceptionQueue(uint8_t virtualChannel) const {
if (virtualChannel < common::NUMBER_OF_VIRTUAL_CHANNELS) { if (virtualChannel < common::NUMBER_OF_VIRTUAL_CHANNELS) {
VirtualChannelMapIter iter = virtualChannelMap.find(virtualChannel); auto iter = virtualChannelMap.find(virtualChannel);
if (iter != virtualChannelMap.end()) { if (iter != virtualChannelMap.end()) {
return iter->second->getReportReceptionQueue(); return iter->second->getReportReceptionQueue();
} else { } else {

2
mission/tmtc/CCSDSHandler.h
View File

@ -67,7 +67,7 @@ class CCSDSHandler : public SystemObject,
*/ */
void addVirtualChannel(VcId_t virtualChannelId, VirtualChannel* virtualChannel); void addVirtualChannel(VcId_t virtualChannelId, VirtualChannel* virtualChannel);
MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0); MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) const override;
ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueIdentifier, ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueIdentifier,
ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues, ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues,
uint16_t startAtIndex); uint16_t startAtIndex);

2
mission/tmtc/TmFunnel.cpp
View File

@ -25,7 +25,7 @@ TmFunnel::TmFunnel(object_id_t objectId, CdsShortTimeStamper& timeReader, uint32
TmFunnel::~TmFunnel() {} TmFunnel::~TmFunnel() {}
MessageQueueId_t TmFunnel::getReportReceptionQueue(uint8_t virtualChannel) { MessageQueueId_t TmFunnel::getReportReceptionQueue(uint8_t virtualChannel) const {
return tmQueue->getId(); return tmQueue->getId();
} }

2
mission/tmtc/TmFunnel.h
View File

@ -29,7 +29,7 @@ class TmFunnel : public AcceptsTelemetryIF, public ExecutableObjectIF, public Sy
virtual ~TmFunnel(); virtual ~TmFunnel();
const char* getName() const override; const char* getName() const override;
MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) override; MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) const override;
ReturnValue_t performOperation(uint8_t operationCode = 0) override; ReturnValue_t performOperation(uint8_t operationCode = 0) override;
ReturnValue_t initialize() override; ReturnValue_t initialize() override;

2
mission/tmtc/VirtualChannel.cpp
View File

@ -53,7 +53,7 @@ ReturnValue_t VirtualChannel::performOperation() {
return result; return result;
} }
MessageQueueId_t VirtualChannel::getReportReceptionQueue(uint8_t virtualChannel) { MessageQueueId_t VirtualChannel::getReportReceptionQueue(uint8_t virtualChannel) const {
return tmQueue->getId(); return tmQueue->getId();
} }

2
mission/tmtc/VirtualChannel.h
View File

@ -27,7 +27,7 @@ class VirtualChannel : public AcceptsTelemetryIF {
VirtualChannel(uint8_t vcId, uint32_t tmQueueDepth, object_id_t ownerId); VirtualChannel(uint8_t vcId, uint32_t tmQueueDepth, object_id_t ownerId);
ReturnValue_t initialize(); ReturnValue_t initialize();
MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) override; MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) const override;
ReturnValue_t performOperation(); ReturnValue_t performOperation();
/** /**

2
tmtc

@ -1 +1 @@
Subproject commit 1dfc2fca2f58f8d226fab01c87eb529ba7ec8376 Subproject commit 3cbfeb70156d2b60c2cce1fc28b4ace7f58e8af3