eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

v1.10.0 #220

Merged
meierj merged 592 commits from develop into main 2022-04-22 07:42:20 +02:00
Conversation 0 Commits 592 Files Changed 218 +5 -5
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 34c0ac3f05 - Show all commits

2
bsp_q7s/core/CoreController.cpp
View File

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

2
bsp_q7s/core/obsw.cpp
View File

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

2
watchdog/Watchdog.cpp
View File

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

2
watchdog/definitions.h
View File

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

2
watchdog/watchdogConf.h.in
View File

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