fixed conflicts

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) {

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

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