watchdog fixes and submodule updates

This commit is contained in:
Robin Müller 2022-04-16 01:04:06 +02:00
parent 25138d8931
commit b0006c2272
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
7 changed files with 8 additions and 6 deletions

2
fsfw

@ -1 +1 @@
Subproject commit cd3153b4640cec7428ebf71fbfbf0b2a1c5e1de3 Subproject commit 96babff67ea7859cc9802db63c5d07a7f64c8255

@ -1 +1 @@
Subproject commit 9a92c7de0a2fedfcc638c0517e3edea123e977f8 Subproject commit 5ad9fb94af3312d29863527106396395f7b808a5

2
tmtc

@ -1 +1 @@
Subproject commit 091cf2dd632c71a0fa8000312bb11e84f1a755db Subproject commit 8a30f669f075c284494d7c1c6618e42e2aec8f15

View File

@ -6,3 +6,5 @@ target_sources(${WATCHDOG_NAME} PRIVATE
target_include_directories(${WATCHDOG_NAME} PRIVATE target_include_directories(${WATCHDOG_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
install(TARGETS ${WATCHDOG_NAME} RUNTIME DESTINATION bin)

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>

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

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