fixed merge conflicts

2021-02-17 10:33:19 +01:00
parent b48798c5c5 a17b6ffcce
commit 9963d42a3e
9 changed files with 285 additions and 23 deletions
--- a/fsfwconfig/OBSWConfig.h
+++ b/fsfwconfig/OBSWConfig.h
@ -14,9 +14,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

 #include "OBSWVersion.h"