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

Merge branch 'develop' into meier/plocSupvUpdate

Browse Source
This commit is contained in:
Jakob Meier
2022-04-21 17:34:26 +02:00
parent 836a2327f9 4325eaa956
commit a8f5a4054f
8 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bsp_q7s/core/CoreController.cpp
View File

@ -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

2
bsp_q7s/core/obsw.cpp
View File

@ -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;