Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/master

2021-08-02 15:47:49 +02:00
parent aabc729e77 5bbe16081f
commit dee063e259
18 changed files with 115 additions and 499 deletions
--- a/src/fsfw/FSFW.h.in
+++ b/src/fsfw/FSFW.h.in
@ -11,4 +11,8 @@
 #cmakedefine FSFW_ADD_MONITORING
 #cmakedefine FSFW_ADD_SGP4_PROPAGATOR

+#ifndef FSFW_HAL_L3GD20_GYRO_DEBUG
+#define FSFW_HAL_L3GD20_GYRO_DEBUG   0
+#endif /* FSFW_HAL_L3GD20_GYRO_DEBUG */
+
 #endif /* FSFW_FSFW_H_ */
--- a/src/fsfw/serviceinterface/ServiceInterface.h
+++ b/src/fsfw/serviceinterface/ServiceInterface.h
@ -1,7 +1,7 @@
 #ifndef FSFW_SERVICEINTERFACE_SERVICEINTERFACE_H_
 #define FSFW_SERVICEINTERFACE_SERVICEINTERFACE_H_

-#include <FSFWConfig.h>
+#include "fsfw/FSFW.h"
 #include "serviceInterfaceDefintions.h"

 #if FSFW_CPP_OSTREAM_ENABLED == 1