From 83c7ec8067490665b2c14ecb5ddb80a1bd0acb20 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 25 May 2022 10:12:37 +0200
Subject: [PATCH] solve merge conflicts

---
 bsp_q7s/core/InitMission.cpp | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/bsp_q7s/core/InitMission.cpp b/bsp_q7s/core/InitMission.cpp
index 008bc68f..b6a4fa37 100644
--- a/bsp_q7s/core/InitMission.cpp
+++ b/bsp_q7s/core/InitMission.cpp
@@ -154,6 +154,10 @@ void initmission::initTasks() {
     initmission::printAddObjectError("SUS_BOARD_ASS", objects::SUS_BOARD_ASS);
   }
 #endif
+  result = sysTask->addComponent(objects::ACS_SUBSYSTEM);
+  if (result != HasReturnvaluesIF::RETURN_OK) {
+    initmission::printAddObjectError("ACS_SUBSYSTEM", objects::ACS_SUBSYSTEM);
+  }
 
   PeriodicTaskIF* tcsPollingTask = factory->createPeriodicTask(
       "TCS_POLLING_TASK", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.5, missedDeadlineFunc);
@@ -161,13 +165,7 @@ void initmission::initTasks() {
   if (result != HasReturnvaluesIF::RETURN_OK) {
     initmission::printAddObjectError("SPI_RTD_POLLING", objects::SPI_RTD_COM_IF);
   }
-<<<<<<< HEAD
-  result = sysTask->addComponent(objects::ACS_SUBSYSTEM);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
-    initmission::printAddObjectError("ACS_SUBSYSTEM", objects::ACS_SUBSYSTEM);
-  }
-#endif /* OBSW_ADD_RTD_DEVICES == 1 */
-=======
+
   PeriodicTaskIF* tcsTask = factory->createPeriodicTask(
       "TCS_TASK", 45, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.8, missedDeadlineFunc);
   std::array<object_id_t, EiveMax31855::NUM_RTDS> rtdIds = {
@@ -198,7 +196,6 @@ void initmission::initTasks() {
     tcsTask->addComponent(rtd, DeviceHandlerIF::GET_READ);
   }
 #endif /* OBSW_ADD_RTD_DEVICES */
->>>>>>> origin/develop
 
   // FS task, task interval does not matter because it runs in permanent loop, priority low
   // because it is a non-essential background task
@@ -295,14 +292,7 @@ void initmission::initTasks() {
   strHelperTask->startTask();
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */
 
-<<<<<<< HEAD
-#if OBSW_ADD_ACS_HANDLERS == 1
-  gpsTask->startTask();
-#endif
-#if OBSW_ADD_RTD_DEVICES == 1
-=======
   acsTask->startTask();
->>>>>>> origin/develop
   sysTask->startTask();
   tcsPollingTask->startTask();
   tcsTask->startTask();