From 292cf8f5e4e0c6e5701d2c17c31ac37df088ca03 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 22 Feb 2022 00:22:15 +0100
Subject: [PATCH] new defintions file

---
 watchdog/CMakeLists.txt    |  4 ++++
 watchdog/definitions.h     | 19 +++++++++++++++++++
 watchdog/watchdogConf.h.in | 17 ++---------------
 3 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 watchdog/definitions.h

diff --git a/watchdog/CMakeLists.txt b/watchdog/CMakeLists.txt
index a01bf853..88908436 100644
--- a/watchdog/CMakeLists.txt
+++ b/watchdog/CMakeLists.txt
@@ -2,3 +2,7 @@ target_sources(${WATCHDOG_NAME} PRIVATE
     main.cpp
     Watchdog.cpp
 )
+
+target_include_directories(${WATCHDOG_NAME} PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
diff --git a/watchdog/definitions.h b/watchdog/definitions.h
new file mode 100644
index 00000000..991de54d
--- /dev/null
+++ b/watchdog/definitions.h
@@ -0,0 +1,19 @@
+#ifndef WATCHDOG_DEFINITIONS_H_
+#define WATCHDOG_DEFINITIONS_H_
+
+namespace watchdog {
+
+// Suspend watchdog operations temporarily
+static constexpr char SUSPEND_CHAR = 's';
+// Resume watchdog operations
+static constexpr char RESTART_CHAR = 'b';
+// Causes the watchdog to close down
+static constexpr char CANCEL_CHAR = 'c';
+
+static constexpr int TIMEOUT_MS = 5 * 1000;
+const std::string FIFO_NAME = "/tmp/watchdog-pipe";
+const std::string RUNNING_FILE_NAME = "/tmp/obsw-running";
+
+}
+
+#endif /* WATCHDOG_DEFINITIONS_H_ */
diff --git a/watchdog/watchdogConf.h.in b/watchdog/watchdogConf.h.in
index 02d84e70..df57c5ec 100644
--- a/watchdog/watchdogConf.h.in
+++ b/watchdog/watchdogConf.h.in
@@ -1,24 +1,11 @@
 #include <cstdint>
 #include <string>
 
+#include "definitions.h"
+
 #define WATCHDOG_VERBOSE_LEVEL              1
 /**
  * This flag instructs the watchdog to create a special file in /tmp if the OBSW is running
  * or to delete it if it is not running
  */
 #define WATCHDOG_CREATE_FILE_IF_RUNNING     1
-
-namespace watchdog {
-
-static constexpr int TIMEOUT_MS = 5 * 1000;
-const std::string FIFO_NAME = "/tmp/watchdog-pipe";
-const std::string RUNNING_FILE_NAME = "/tmp/obsw-running";
-
-// Suspend watchdog operations temporarily
-static constexpr char SUSPEND_CHAR = 's';
-// Resume watchdog operations
-static constexpr char RESTART_CHAR = 'b';
-// Causes the watchdog to close down
-static constexpr char CANCEL_CHAR = 'c';
-
-}