From 8b875e13c5dc845b662fa3b6264bdd32e300759f Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 16 May 2022 15:46:20 +0200
Subject: [PATCH 1/2] repoint fsfw

---
 fsfw | 2 +-
 tmtc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fsfw b/fsfw
index fc2b7091..4841d5d9 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit fc2b709148d273368e59969ee073670cb282ac29
+Subproject commit 4841d5d92d721383e92b521b584c7d0e62c9873d
diff --git a/tmtc b/tmtc
index a125d502..b81f756e 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit a125d502ec42fcc5958c6063662146c84ae6b762
+Subproject commit b81f756e4b70e55a443cba50bab0a519a0dc3591

From e2cfce634b194b58d64bacbfc9b8e277d5ae47e2 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 17 May 2022 13:35:21 +0200
Subject: [PATCH 2/2] GenericFactory bugfix

---
 mission/core/GenericFactory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index fdf21541..3ab598f3 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -49,7 +49,7 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_) {
   // Framework objects
   new EventManager(objects::EVENT_MANAGER);
   auto healthTable = new HealthTable(objects::HEALTH_TABLE);
-  if (healthTable != nullptr) {
+  if (healthTable_ != nullptr) {
     *healthTable_ = healthTable;
   }
   new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);