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

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

Browse Source
This commit is contained in:
Robin Müller
2022-08-30 15:40:52 +02:00
parent ae40543e3a e10e71cee9
commit eedf57624f
5 changed files with 60 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@
#include "fsfw/serviceinterface/serviceInterfaceDefintions.h"
#include "fsfw/tasks/ExecutableObjectIF.h"
#include "fsfw/tasks/PeriodicTaskIF.h"
#include "fsfw/util/dataWrapper.h"
namespace Factory {
void setStaticFrameworkObjectIds();
@ -1069,8 +1070,7 @@ class DeviceHandlerBase : public DeviceHandlerIF,
bool isAwaitingReply();
void handleDeviceTM(SerializeIF *dataSet, DeviceCommandId_t replyId, bool forceDirectTm = false);
void handleDeviceTM(const uint8_t *data, size_t dataSize, DeviceCommandId_t replyId,
void handleDeviceTm(util::DataWrapper dataWrapper, DeviceCommandId_t replyId,
bool forceDirectTm = false);
virtual ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode,