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

Small fixes

This commit is contained in:
Ulrich Mohr 2022-07-28 14:43:22 +02:00
parent f56646d2c3
commit f9e9ff320f
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsfw/action/Action.h
View File

@ -26,7 +26,7 @@ class Action: public SerializeIF {
MessageQueueId_t commandedBy; MessageQueueId_t commandedBy;
virtual ReturnValue_t handle() = 0; [[nodiscard]] virtual ReturnValue_t handle() = 0;
void registerParameter(ParameterIF *parameter); void registerParameter(ParameterIF *parameter);

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

@ -1263,6 +1263,10 @@ void DeviceHandlerBase::handleDeviceTM(SerializeIF* dataSet, DeviceCommandId_t r
} }
} }
ActionHelper *DeviceHandlerBase::getActionHelper() {
return &actionHelper;
}
ReturnValue_t DeviceHandlerBase::executeAction(Action *action) { ReturnValue_t DeviceHandlerBase::executeAction(Action *action) {
ReturnValue_t result = acceptExternalDeviceCommands(); ReturnValue_t result = acceptExternalDeviceCommands();
if (result != HasReturnvaluesIF::RETURN_OK) { if (result != HasReturnvaluesIF::RETURN_OK) {

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

@ -201,7 +201,8 @@ class DeviceHandlerBase : public DeviceHandlerIF,
*/ */
virtual void setParentQueue(MessageQueueId_t parentQueueId); virtual void setParentQueue(MessageQueueId_t parentQueueId);
/** @brief Implementation required for HasActionIF */ /** @brief Implementations required for HasActionIF */
ActionHelper* getActionHelper() override;
ReturnValue_t executeAction(Action *action) override; ReturnValue_t executeAction(Action *action) override;
Mode_t getTransitionSourceMode() const; Mode_t getTransitionSourceMode() const;
@ -310,6 +311,8 @@ class DeviceHandlerBase : public DeviceHandlerIF,
* - Anything else triggers an even with the returnvalue as a parameter * - Anything else triggers an even with the returnvalue as a parameter
*/ */
virtual ReturnValue_t buildTransitionDeviceCommand(DeviceCommandId_t *id) = 0; virtual ReturnValue_t buildTransitionDeviceCommand(DeviceCommandId_t *id) = 0;
//TODO Remove and update documentation
/** /**
* @brief Build a device command packet from data supplied by a direct * @brief Build a device command packet from data supplied by a direct
* command (PUS Service 8) * command (PUS Service 8)