watchdog fixes and submodule updates

2022-04-16 01:04:06 +02:00 · 2022-04-16 01:04:06 +02:00 · b0006c2272
commit b0006c2272
parent 25138d8931
7 changed files with 8 additions and 6 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit cd3153b4640cec7428ebf71fbfbf0b2a1c5e1de3
+Subproject commit 96babff67ea7859cc9802db63c5d07a7f64c8255
--- a/generators/fsfwgen
+++ b/generators/fsfwgen
@ -1 +1 @@
-Subproject commit 9a92c7de0a2fedfcc638c0517e3edea123e977f8
+Subproject commit 5ad9fb94af3312d29863527106396395f7b808a5
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 091cf2dd632c71a0fa8000312bb11e84f1a755db
+Subproject commit 8a30f669f075c284494d7c1c6618e42e2aec8f15
--- a/watchdog/CMakeLists.txt
+++ b/watchdog/CMakeLists.txt
@ -6,3 +6,5 @@ target_sources(${WATCHDOG_NAME} PRIVATE
 target_include_directories(${WATCHDOG_NAME} PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}
 )
+
+install(TARGETS ${WATCHDOG_NAME} RUNTIME DESTINATION bin)
--- a/watchdog/Watchdog.cpp
+++ b/watchdog/Watchdog.cpp
@ -1,5 +1,5 @@
 #include "Watchdog.h"
-#include "watchdogConf.h"
+#include "definitions.h"

 #include <errno.h>
 #include <sys/types.h>
--- a/watchdog/definitions.h
+++ b/watchdog/definitions.h
@ -1,6 +1,8 @@
 #ifndef WATCHDOG_DEFINITIONS_H_
 #define WATCHDOG_DEFINITIONS_H_

+#include <watchdogConf.h>
+
 namespace watchdog {

 // Suspend watchdog operations temporarily
--- a/watchdog/watchdogConf.h.in
+++ b/watchdog/watchdogConf.h.in
@ -1,8 +1,6 @@
 #include <cstdint>
 #include <string>

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