From 850722eae5a5f47bc6e9fa35ec5a7e3bedf72c00 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 19 Apr 2022 17:24:04 +0200 Subject: [PATCH] include improvements --- bsp_q7s/core/CoreController.cpp | 2 +- bsp_q7s/core/obsw.cpp | 2 +- watchdog/Watchdog.cpp | 2 +- watchdog/definitions.h | 2 ++ watchdog/watchdogConf.h.in | 2 -- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp index 42ba4307..73fd49bb 100644 --- a/bsp_q7s/core/CoreController.cpp +++ b/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 diff --git a/bsp_q7s/core/obsw.cpp b/bsp_q7s/core/obsw.cpp index 27d1484e..359d04c2 100644 --- a/bsp_q7s/core/obsw.cpp +++ b/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; diff --git a/watchdog/Watchdog.cpp b/watchdog/Watchdog.cpp index 9ae60548..a14bae53 100644 --- a/watchdog/Watchdog.cpp +++ b/watchdog/Watchdog.cpp @@ -1,5 +1,5 @@ #include "Watchdog.h" -#include "watchdogConf.h" +#include "definitions.h" #include #include diff --git a/watchdog/definitions.h b/watchdog/definitions.h index 991de54d..bfb1ec13 100644 --- a/watchdog/definitions.h +++ b/watchdog/definitions.h @@ -1,6 +1,8 @@ #ifndef WATCHDOG_DEFINITIONS_H_ #define WATCHDOG_DEFINITIONS_H_ +#include + namespace watchdog { // Suspend watchdog operations temporarily diff --git a/watchdog/watchdogConf.h.in b/watchdog/watchdogConf.h.in index b1b9956b..41bebe72 100644 --- a/watchdog/watchdogConf.h.in +++ b/watchdog/watchdogConf.h.in @@ -1,8 +1,6 @@ #include #include -#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