Merge branch 'development' into mueller/master

This commit is contained in:
Robin Müller 2021-01-19 16:55:58 +01:00
commit cc2e26443d
3 changed files with 19 additions and 2 deletions

View File

@ -116,7 +116,15 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-Wno-unused-parameter
-Wno-psabi
)
if(NOT DEFINED WARNING_SHADOW_LOCAL)
option(WARNING_SHADOW_LOCAL "Show shadows declarations warning." ON)
endif()
if(WARNING_SHADOW_LOCAL)
list(APPEND WARNING_FLAGS "-Wshadow=local")
endif()
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")

View File

@ -1,4 +1,6 @@
#include "ActionMessage.h"
#include "HasActionsIF.h"
#include "../objectmanager/ObjectManagerIF.h"
#include "../storagemanager/StorageManagerIF.h"
@ -53,7 +55,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);

View File

@ -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. Classes like the
* ActionHelper are able to process these messages.
*/
class ActionMessage {
private:
ActionMessage();