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

Merge remote-tracking branch 'upstream/mueller/dhb-handle-device-tm-2' into develop

Browse Source
This commit is contained in:
Robin Müller 2022-08-31 00:02:52 +02:00
commit 2fa76d3663
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fsfw/devicehandlers/DeviceHandlerBase.cpp
View File

@ -1276,7 +1276,7 @@ void DeviceHandlerBase::handleDeviceTm(const uint8_t* rawData, size_t rawDataLen
handleDeviceTm(bufferWrapper, replyId, forceDirectTm); handleDeviceTm(bufferWrapper, replyId, forceDirectTm);
} }
void DeviceHandlerBase::handleDeviceTm(SerializeIF& dataSet, DeviceCommandId_t replyId, void DeviceHandlerBase::handleDeviceTm(const SerializeIF& dataSet, DeviceCommandId_t replyId,
bool forceDirectTm) { bool forceDirectTm) {
auto iter = deviceReplyMap.find(replyId); auto iter = deviceReplyMap.find(replyId);
if (iter == deviceReplyMap.end()) { if (iter == deviceReplyMap.end()) {
@ -1291,7 +1291,7 @@ void DeviceHandlerBase::handleDeviceTm(SerializeIF& dataSet, DeviceCommandId_t r
// This may fail, but we'll ignore the fault. // This may fail, but we'll ignore the fault.
if (queueId != NO_COMMANDER) { if (queueId != NO_COMMANDER) {
// This may fail, but we'll ignore the fault. // This may fail, but we'll ignore the fault.
actionHelper.reportData(queueId, replyId, &dataSet); actionHelper.reportData(queueId, replyId, const_cast<SerializeIF*>(&dataSet));
} }
// This check should make sure we get any TM but don't get anything doubled. // This check should make sure we get any TM but don't get anything doubled.
@ -1305,7 +1305,8 @@ void DeviceHandlerBase::handleDeviceTm(SerializeIF& dataSet, DeviceCommandId_t r
// hiding of sender needed so the service will handle it as // hiding of sender needed so the service will handle it as
// unexpected Data, no matter what state (progress or completed) // unexpected Data, no matter what state (progress or completed)
// it is in // it is in
actionHelper.reportData(defaultRawReceiver, replyId, &dataSet, true); actionHelper.reportData(defaultRawReceiver, replyId, const_cast<SerializeIF*>(&dataSet),
true);
} }
} }
// Unrequested or aperiodic replies // Unrequested or aperiodic replies

3
src/fsfw/devicehandlers/DeviceHandlerBase.h
View File

@ -1072,7 +1072,8 @@ class DeviceHandlerBase : public DeviceHandlerIF,
void handleDeviceTm(const uint8_t *rawData, size_t rawDataLen, DeviceCommandId_t replyId, void handleDeviceTm(const uint8_t *rawData, size_t rawDataLen, DeviceCommandId_t replyId,
bool forceDirectTm = false); bool forceDirectTm = false);
void handleDeviceTm(SerializeIF &dataSet, DeviceCommandId_t replyId, bool forceDirectTm = false); void handleDeviceTm(const SerializeIF &dataSet, DeviceCommandId_t replyId,
bool forceDirectTm = false);
virtual ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode, virtual ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode,
uint32_t *msToReachTheMode); uint32_t *msToReachTheMode);