From d430c5fbc732ae66cba0f5d21105e9f6c867da7b Mon Sep 17 00:00:00 2001
From: "Jakob.Meier" <–meierj@irs.uni-stuttgart.de>
Date: Fri, 23 Jul 2021 18:04:51 +0200
Subject: [PATCH] fixed conflicts

---
 bsp_q7s/core/ObjectFactory.cpp          | 4 ++--
 linux/fsfwconfig/OBSWConfig.h.in        | 2 +-
 mission/devices/PlocSupervisorHandler.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 8bb36ff6..3e36e63d 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -122,9 +122,11 @@ void ObjectFactory::produce(void* args){
             std::string("/dev/i2c-0"));
     new IMTQHandler(objects::IMTQ_HANDLER, objects::I2C_COM_IF, imtqI2cCookie);
 
+#if ADD_PLOC_MPSOC == 1
     UartCookie* mpsocUartCookie = new UartCookie(objects::RW1, std::string("/dev/ttyUL3"),
             UartModes::NON_CANONICAL, 115200, PLOC_MPSOC::MAX_REPLY_SIZE);
     new PlocMPSoCHandler(objects::PLOC_MPSOC_HANDLER, objects::UART_COM_IF, mpsocUartCookie);
+#endif /* ADD_PLOC_MPSOC */
 
     createReactionWheelComponents(gpioComIF);
 #endif /* TE7020 != 0 */
@@ -507,8 +509,6 @@ void ObjectFactory::createSyrlinksComponents() {
     syrlinksUartCookie->setParityEven();
 
     new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER, objects::UART_COM_IF, syrlinksUartCookie);
-    SyrlinksHkHandler* syrlinksHkHandler = new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER,
-            objects::UART_COM_IF, syrlinksUartCookie);
 }
 
 void ObjectFactory::createRtdComponents(LinuxLibgpioIF *gpioComIF) {
diff --git a/linux/fsfwconfig/OBSWConfig.h.in b/linux/fsfwconfig/OBSWConfig.h.in
index 83af12b1..ab55537d 100644
--- a/linux/fsfwconfig/OBSWConfig.h.in
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@@ -49,7 +49,7 @@ debugging. */
 #define IMTQ_DEBUG                      1
 #define RW_DEBUG                        0
 #define START_TRACKER_DEBUG             0
-#define PLOC_MPSOC_DEBUG	            1
+#define PLOC_MPSOC_DEBUG	            0
 #define PLOC_SUPERVISOR_DEBUG           1
 
 // Leave at one as the BSP is linux. Used by the ADIS16507 device handler
diff --git a/mission/devices/PlocSupervisorHandler.h b/mission/devices/PlocSupervisorHandler.h
index f56dab99..e91fb1e4 100644
--- a/mission/devices/PlocSupervisorHandler.h
+++ b/mission/devices/PlocSupervisorHandler.h
@@ -4,7 +4,7 @@
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <mission/devices/devicedefinitions/PlocSupervisorDefinitions.h>
 #include <cstring>
-#include <fsfw_hal/linux/uart/UartComIF.h>
+#include <fsfw/hal/linux/uart/UartComIF.h>
 
 /**
  * @brief	This is the device handler for the supervisor of the PLOC which is programmed by