From cc5fdef7fbf3d1e8de76eca9612d6f6bd34d9e74 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 11 Oct 2021 13:18:33 +0200
Subject: [PATCH] updated FSFWConfig.h.in and submodules

---
 bsp_stm32h7_freertos/fsfwconfig/FSFWConfig.h.in | 9 +++++++++
 cmake/stm32-cmake                               | 2 +-
 example_common                                  | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bsp_stm32h7_freertos/fsfwconfig/FSFWConfig.h.in b/bsp_stm32h7_freertos/fsfwconfig/FSFWConfig.h.in
index d03ec3e..dfb3feb 100644
--- a/bsp_stm32h7_freertos/fsfwconfig/FSFWConfig.h.in
+++ b/bsp_stm32h7_freertos/fsfwconfig/FSFWConfig.h.in
@@ -1,8 +1,13 @@
 #ifndef CONFIG_FSFWCONFIG_H_
 #define CONFIG_FSFWCONFIG_H_
 
+#ifdef __cplusplus
 #include <cstddef>
 #include <cstdint>
+#else
+#include <stddef.h>
+#include <stdint.h>
+#endif
 
 //! Used to determine whether C++ ostreams are used which can increase
 //! the binary size significantly. If this is disabled,
@@ -50,6 +55,8 @@
 //! If set to 1 the binary needs "cap_sys_nice=eip" privileges to run
 #define FSFW_USE_REALTIME_FOR_LINUX     1
 
+#ifdef __cplusplus
+
 namespace fsfwconfig {
 
 //! Default timestamp size. The default timestamp will be an seven byte CDC short timestamp.
@@ -72,4 +79,6 @@ static constexpr size_t FSFW_MAX_TM_PACKET_SIZE = 2048;
 
 }
 
+#endif
+
 #endif /* CONFIG_FSFWCONFIG_H_ */
diff --git a/cmake/stm32-cmake b/cmake/stm32-cmake
index ac4ddbc..e3a834d 160000
--- a/cmake/stm32-cmake
+++ b/cmake/stm32-cmake
@@ -1 +1 @@
-Subproject commit ac4ddbc6be1516548bd8659128afe6d804942ee0
+Subproject commit e3a834d8409c394136af43bdf8c084941ed44b53
diff --git a/example_common b/example_common
index 127a0f6..a0d775e 160000
--- a/example_common
+++ b/example_common
@@ -1 +1 @@
-Subproject commit 127a0f6e16ac33f3e2af03a0a5e050ecc02a90cf
+Subproject commit a0d775e086c9fa0506ad656c5e2d863f8f8e7f9b