Merge pull request 'git is weird' (#15) from mueller/action-git-update into mueller/master

Reviewed-on: KSat/fsfw#15
2020-08-28 17:37:29 +02:00 · 2020-08-28 17:37:29 +02:00 · 2e23fc1201
commit 2e23fc1201
parent 468ebfb809 8862f35ad1
10 changed files with 669 additions and 669 deletions
--- a/action/ActionHelper.cpp
+++ b/action/ActionHelper.cpp
@ -1,5 +1,5 @@
-#include "../action/ActionHelper.h"
-#include "../action/HasActionsIF.h"
+#include "ActionHelper.h"
+#include "HasActionsIF.h"
 #include "../objectmanager/ObjectManagerIF.h"

 ActionHelper::ActionHelper(HasActionsIF* setOwner, MessageQueueIF* useThisQueue) :
--- a/action/ActionHelper.h
+++ b/action/ActionHelper.h
@ -1,7 +1,7 @@
 #ifndef ACTIONHELPER_H_
 #define ACTIONHELPER_H_

-#include "../action/ActionMessage.h"
+#include "ActionMessage.h"
 #include "../serialize/SerializeIF.h"
 #include "../ipc/MessageQueueIF.h"
 /**
@ -35,7 +35,7 @@ public:
 	ReturnValue_t handleActionMessage(CommandMessage* command);
 	/**
 	 * Helper initialize function. Must be called before use of any other helper function
-	 * @param queueToUse_ Pointer to the messageQueue to be used
+	 * @param queueToUse_ Pointer to the messageQueue to be used, optional if queue was set in constructor
 	 * @return Returns RETURN_OK if successful
 	 */
 	ReturnValue_t initialize(MessageQueueIF* queueToUse_ = nullptr);
--- a/action/ActionMessage.cpp
+++ b/action/ActionMessage.cpp
@ -1,4 +1,4 @@
-#include "../action/ActionMessage.h"
+#include "ActionMessage.h"
 #include "../objectmanager/ObjectManagerIF.h"
 #include "../storagemanager/StorageManagerIF.h"

--- a/action/CommandActionHelper.cpp
+++ b/action/CommandActionHelper.cpp
@ -1,7 +1,7 @@
-#include "../action/ActionMessage.h"
-#include "../action/CommandActionHelper.h"
-#include "../action/CommandsActionsIF.h"
-#include "../action/HasActionsIF.h"
+#include "ActionMessage.h"
+#include "CommandActionHelper.h"
+#include "CommandsActionsIF.h"
+#include "HasActionsIF.h"
 #include "../objectmanager/ObjectManagerIF.h"

 CommandActionHelper::CommandActionHelper(CommandsActionsIF *setOwner) :
--- a/action/CommandActionHelper.h
+++ b/action/CommandActionHelper.h
@ -1,7 +1,7 @@
 #ifndef COMMANDACTIONHELPER_H_
 #define COMMANDACTIONHELPER_H_

-#include "../action/ActionMessage.h"
+#include "ActionMessage.h"
 #include "../objectmanager/ObjectManagerIF.h"
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include "../serialize/SerializeIF.h"
--- a/action/CommandsActionsIF.h
+++ b/action/CommandsActionsIF.h
@ -1,7 +1,7 @@
 #ifndef COMMANDSACTIONSIF_H_
 #define COMMANDSACTIONSIF_H_

-#include "../action/CommandActionHelper.h"
+#include "CommandActionHelper.h"
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include "../ipc/MessageQueueIF.h"

--- a/action/HasActionsIF.h
+++ b/action/HasActionsIF.h
@ -1,9 +1,9 @@
 #ifndef FRAMEWORK_ACTION_HASACTIONSIF_H_
 #define FRAMEWORK_ACTION_HASACTIONSIF_H_

-#include "../action/ActionHelper.h"
-#include "../action/ActionMessage.h"
-#include "../action/SimpleActionHelper.h"
+#include "ActionHelper.h"
+#include "ActionMessage.h"
+#include "SimpleActionHelper.h"
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include "../ipc/MessageQueueIF.h"
 /**
--- a/action/SimpleActionHelper.cpp
+++ b/action/SimpleActionHelper.cpp
@ -1,5 +1,5 @@
-#include "../action/HasActionsIF.h"
-#include "../action/SimpleActionHelper.h"
+#include "HasActionsIF.h"
+#include "SimpleActionHelper.h"
 SimpleActionHelper::SimpleActionHelper(HasActionsIF* setOwner,
 		MessageQueueIF* useThisQueue) :
 		ActionHelper(setOwner, useThisQueue), isExecuting(false), lastCommander(
--- a/action/SimpleActionHelper.h
+++ b/action/SimpleActionHelper.h
@ -1,7 +1,7 @@
 #ifndef SIMPLEACTIONHELPER_H_
 #define SIMPLEACTIONHELPER_H_

-#include "../action/ActionHelper.h"
+#include "ActionHelper.h"

 class SimpleActionHelper: public ActionHelper {
 public: