Merge remote-tracking branch 'origin/develop' into mueller/master

2021-02-22 12:59:05 +01:00
parent 7f969a47d6 ac952402f0
commit fd5e1ee544
18 changed files with 685 additions and 37 deletions
--- a/fsfwconfig/OBSWConfig.h
+++ b/fsfwconfig/OBSWConfig.h
@ -19,9 +19,10 @@ debugging. */

 #define TE0720              0

-#define P60DOCK_DEBUG       0
-#define PDU1_DEBUG          0
-#define PDU2_DEBUG          0
+#define P60DOCK_DEBUG   0
+#define PDU1_DEBUG  0
+#define PDU2_DEBUG  0
+#define ACU_DEBUG  1

 #ifdef __cplusplus