From 113b4b5ffaa32bbd6b6ec94bab6763112bd3d764 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 18 Jan 2021 19:44:25 +0100 Subject: [PATCH 1/3] important bugfix --- action/ActionMessage.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/action/ActionMessage.cpp b/action/ActionMessage.cpp index b0bcabaa..4e56feea 100644 --- a/action/ActionMessage.cpp +++ b/action/ActionMessage.cpp @@ -1,3 +1,4 @@ +#include #include "ActionMessage.h" #include "../objectmanager/ObjectManagerIF.h" #include "../storagemanager/StorageManagerIF.h" @@ -53,7 +54,7 @@ void ActionMessage::setDataReply(CommandMessage* message, ActionId_t actionId, void ActionMessage::setCompletionReply(CommandMessage* message, ActionId_t fid, ReturnValue_t result) { - if (result == HasReturnvaluesIF::RETURN_OK) { + if (result == HasReturnvaluesIF::RETURN_OK or result == HasActionsIF::EXECUTION_FINISHED) { message->setCommand(COMPLETION_SUCCESS); } else { message->setCommand(COMPLETION_FAILED); From d4b08459f4e27441181d068dcbeb903eec325578 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 18 Jan 2021 19:49:15 +0100 Subject: [PATCH 2/3] smaller changes and documentation --- action/ActionMessage.cpp | 3 ++- action/ActionMessage.h | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/action/ActionMessage.cpp b/action/ActionMessage.cpp index 4e56feea..1c00dee0 100644 --- a/action/ActionMessage.cpp +++ b/action/ActionMessage.cpp @@ -1,5 +1,6 @@ -#include #include "ActionMessage.h" +#include "HasActionsIF.h" + #include "../objectmanager/ObjectManagerIF.h" #include "../storagemanager/StorageManagerIF.h" diff --git a/action/ActionMessage.h b/action/ActionMessage.h index 7a859de0..be7116d7 100644 --- a/action/ActionMessage.h +++ b/action/ActionMessage.h @@ -4,8 +4,15 @@ #include "../ipc/CommandMessage.h" #include "../objectmanager/ObjectManagerIF.h" #include "../storagemanager/StorageManagerIF.h" -typedef uint32_t ActionId_t; +using ActionId_t = uint32_t; + +/** + * @brief These messages are part of the action module of the FSFW. + * @details + * These messages are sent amongst objects implementing the HasActionsIF. The ActionHelper + * class is able to process these messages. + */ class ActionMessage { private: ActionMessage(); From 87fbb5ce756e77fb3f82b134b1705f79547b9fdc Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 18 Jan 2021 19:49:59 +0100 Subject: [PATCH 3/3] imrpoved doc --- action/ActionMessage.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/action/ActionMessage.h b/action/ActionMessage.h index be7116d7..deb11095 100644 --- a/action/ActionMessage.h +++ b/action/ActionMessage.h @@ -10,8 +10,8 @@ using ActionId_t = uint32_t; /** * @brief These messages are part of the action module of the FSFW. * @details - * These messages are sent amongst objects implementing the HasActionsIF. The ActionHelper - * class is able to process these messages. + * These messages are sent amongst objects implementing the HasActionsIF. Classes like the + * ActionHelper are able to process these messages. */ class ActionMessage { private: