From 57331380c312dcabd2f0bf4d516d3e5af9f36ccd Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 15 Sep 2022 11:38:29 +0200
Subject: [PATCH] small fix for ACS task

---
 CHANGELOG.md                 | 1 +
 bsp_q7s/core/InitMission.cpp | 2 +-
 fsfw                         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30890da2..3a7e2259 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ list yields a list of all related PRs for each release.
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/293
 - Increase number of allowed consescutive action commands from 3 to 16
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/294
+- Fix for EM SW: Always create ACS Task
 
 # [v1.13.0] 24.08.2022
 
diff --git a/bsp_q7s/core/InitMission.cpp b/bsp_q7s/core/InitMission.cpp
index 6e0fce0c..c6f7ce51 100644
--- a/bsp_q7s/core/InitMission.cpp
+++ b/bsp_q7s/core/InitMission.cpp
@@ -124,9 +124,9 @@ void initmission::initTasks() {
   }
 #endif /* OBSW_USE_CCSDS_IP_CORE == 1 */
 
-#if OBSW_ADD_ACS_HANDLERS == 1
   PeriodicTaskIF* acsTask = factory->createPeriodicTask(
       "ACS_TASK", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.4, missedDeadlineFunc);
+#if OBSW_ADD_ACS_HANDLERS == 1
   result = acsTask->addComponent(objects::GPS_CONTROLLER);
   if (result != returnvalue::OK) {
     initmission::printAddObjectError("GPS_CTRL", objects::GPS_CONTROLLER);
diff --git a/fsfw b/fsfw
index bd594123..cf8fe7ea 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit bd594123a2a1579f505071f9c76d1249433c070e
+Subproject commit cf8fe7ea728bea077b9936bcf0db96845bc6419e