Merge pull request 'fix and improvement for include handling in OBSW watchdog' (#216) from mueller/watchdog-fixes into develop

Reviewed-on: #216
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

bsp_q7s/core/CoreController.cpp

@@ -8,7 +8,7 @@
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "fsfw/timemanager/Stopwatch.h"
 #include "fsfw/version.h"
-#include "watchdogConf.h"
+#include "watchdog/definitions.h"
 #if OBSW_USE_TMTC_TCP_BRIDGE == 0
 #include "fsfw/osal/common/UdpTmTcBridge.h"
 #else

bsp_q7s/core/obsw.cpp

@@ -8,7 +8,7 @@
 #include "OBSWVersion.h"
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/version.h"
-#include "watchdogConf.h"
+#include "watchdog/definitions.h"
 
 static int OBSW_ALREADY_RUNNING = -2;
 

watchdog/Watchdog.cpp

@@ -1,5 +1,5 @@
 #include "Watchdog.h"
-#include "watchdogConf.h"
+#include "definitions.h"
 
 #include <errno.h>
 #include <sys/types.h>

watchdog/definitions.h

@@ -1,6 +1,8 @@
 #ifndef WATCHDOG_DEFINITIONS_H_
 #define WATCHDOG_DEFINITIONS_H_
 
+#include <watchdogConf.h>
+
 namespace watchdog {
 
 // Suspend watchdog operations temporarily

watchdog/watchdogConf.h.in

@@ -1,8 +1,6 @@
 #include <cstdint>
 #include <string>
 
-#include "watchdog/definitions.h"
-
 #define WATCHDOG_VERBOSE_LEVEL              1
 /**
  * This flag instructs the watchdog to create a special file in /tmp if the OBSW is running