diff --git a/cmake/scripts/Q7S/watchdog/make_debug_cfg.sh b/cmake/scripts/Q7S/watchdog/make_debug_cfg.sh
new file mode 100755
index 00000000..d5b58df9
--- /dev/null
+++ b/cmake/scripts/Q7S/watchdog/make_debug_cfg.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+counter=0
+while [ ${counter} -lt 5 ]
+do
+ cd ..
+ if [ -f "cmake_build_config.py" ];then
+ break
+ fi
+ counter=$((counter=counter + 1))
+done
+
+if [ "${counter}" -ge 5 ];then
+ echo "cmake_build_config.py not found in upper directories!"
+ exit 1
+fi
+
+os_fsfw="linux"
+tgt_bsp="arm/q7s"
+build_dir="build-Debug-Watchdog"
+build_generator=""
+definitions="BUILD_WATCHDOG=ON"
+if [ "${OS}" = "Windows_NT" ]; then
+ build_generator="MinGW Makefiles"
+ python="py"
+# Could be other OS but this works for now.
+else
+ build_generator="Unix Makefiles"
+ python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command
+${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
+ -d "${definitions}" -l"${build_dir}"
+# set +x
+
diff --git a/cmake/scripts/Q7S/watchdog/make_release_cfg.sh b/cmake/scripts/Q7S/watchdog/make_release_cfg.sh
new file mode 100755
index 00000000..726e82ed
--- /dev/null
+++ b/cmake/scripts/Q7S/watchdog/make_release_cfg.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+counter=0
+while [ ${counter} -lt 5 ]
+do
+ cd ..
+ if [ -f "cmake_build_config.py" ];then
+ break
+ fi
+ counter=$((counter=counter + 1))
+done
+
+if [ "${counter}" -ge 5 ];then
+ echo "cmake_build_config.py not found in upper directories!"
+ exit 1
+fi
+
+os_fsfw="linux"
+tgt_bsp="arm/q7s"
+build_dir="build-Release-Watchdog"
+build_generator=""
+definitions="BUILD_WATCHDOG=ON"
+if [ "${OS}" = "Windows_NT" ]; then
+ build_generator="MinGW Makefiles"
+ python="py"
+# Could be other OS but this works for now.
+else
+ build_generator="Unix Makefiles"
+ python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command
+${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \
+ -d "${definitions} -l"${build_dir}"
+# set +x
+
diff --git a/cmake/scripts/Q7S/watchdog/ninja_debug_cfg.sh b/cmake/scripts/Q7S/watchdog/ninja_debug_cfg.sh
new file mode 100755
index 00000000..99a414e7
--- /dev/null
+++ b/cmake/scripts/Q7S/watchdog/ninja_debug_cfg.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+counter=0
+while [ ${counter} -lt 5 ]
+do
+ cd ..
+ if [ -f "cmake_build_config.py" ];then
+ break
+ fi
+ counter=$((counter=counter + 1))
+done
+
+if [ "${counter}" -ge 5 ];then
+ echo "cmake_build_config.py not found in upper directories!"
+ exit 1
+fi
+
+os_fsfw="linux"
+tgt_bsp="arm/q7s"
+build_dir="build-Debug-Watchdog"
+build_generator="Ninja"
+definitions="-DBUILD_WATCHDOG=ON"
+if [ "${OS}" = "Windows_NT" ]; then
+ python="py"
+# Could be other OS but this works for now.
+else
+ python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command
+${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
+ -d "${definitions}" -l "${build_dir}"
+# set +x
+
diff --git a/cmake/scripts/Q7S/watchdog/ninja_release_cfg.sh b/cmake/scripts/Q7S/watchdog/ninja_release_cfg.sh
new file mode 100755
index 00000000..3e6beac3
--- /dev/null
+++ b/cmake/scripts/Q7S/watchdog/ninja_release_cfg.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+counter=0
+while [ ${counter} -lt 5 ]
+do
+ cd ..
+ if [ -f "cmake_build_config.py" ];then
+ break
+ fi
+ counter=$((counter=counter + 1))
+done
+
+if [ "${counter}" -ge 5 ];then
+ echo "cmake_build_config.py not found in upper directories!"
+ exit 1
+fi
+
+os_fsfw="linux"
+tgt_bsp="arm/q7s"
+build_dir="build-Release-Watchdog"
+build_generator="Ninja"
+definitions="BUILD_WATCHDOG=ON"
+if [ "${OS}" = "Windows_NT" ]; then
+ python="py"
+# Could be other OS but this works for now.
+else
+ python="python3"
+fi
+
+echo "Running command (without the leading +):"
+set -x # Print command
+${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \
+ -d "${definitions}" -l"${build_dir}"
+# set +x
+
diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject
index 84814acc..fe0208b8 100644
--- a/misc/eclipse/.cproject
+++ b/misc/eclipse/.cproject
@@ -254,7 +254,7 @@
-
+
@@ -1031,6 +1031,332 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1044,6 +1370,9 @@
+
+
+
@@ -1060,6 +1389,7 @@
+