From a462677ed26fbe3d58483f1995a3c31a603be6c2 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 8 Jul 2022 16:39:07 +0200
Subject: [PATCH] smaller fixes, always download ETL

---
 CMakeLists.txt                    | 26 +++++++++++++-------------
 bsp_linux_board/ObjectFactory.cpp |  2 +-
 fsfw                              |  2 +-
 tmtc                              |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e18fa588..7317b5a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -374,20 +374,20 @@ add_subdirectory(${UNITTEST_PATH})
 
 # This should have already been downloaded by the FSFW Still include it to be
 # safe
-find_package(etl ${FSFW_ETL_LIB_MAJOR_VERSION} CONFIG QUIET)
+# find_package(etl ${FSFW_ETL_LIB_MAJOR_VERSION} CONFIG QUIET)
 # Not installed, so use FetchContent to download and provide etl
-if(NOT etl_FOUND)
-  message(
-    STATUS
-      "No ETL installation was found with find_package. Installing and providing "
-      "etl with FindPackage")
-  include(FetchContent)
-  FetchContent_Declare(
-    etl
-    GIT_REPOSITORY https://github.com/ETLCPP/etl
-    GIT_TAG ${FSFW_ETL_LIB_VERSION})
-  list(APPEND FSFW_FETCH_CONTENT_TARGETS etl)
-endif()
+# if(NOT etl_FOUND)
+message(
+  STATUS
+    "No ETL installation was found with find_package. Installing and providing "
+    "etl with FindPackage")
+include(FetchContent)
+FetchContent_Declare(
+  etl
+  GIT_REPOSITORY https://github.com/ETLCPP/etl
+  GIT_TAG ${FSFW_ETL_LIB_VERSION})
+list(APPEND FSFW_FETCH_CONTENT_TARGETS etl)
+# endif()
 
 # Use same Catch2 version as framework
 if(NOT (TGT_BSP MATCHES "arm/te0720-1cfa")
diff --git a/bsp_linux_board/ObjectFactory.cpp b/bsp_linux_board/ObjectFactory.cpp
index 5ac79123..19a00647 100644
--- a/bsp_linux_board/ObjectFactory.cpp
+++ b/bsp_linux_board/ObjectFactory.cpp
@@ -20,7 +20,7 @@
 #include "mission/core/GenericFactory.h"
 #include "mission/devices/GPSHyperionHandler.h"
 #include "mission/devices/GyroADIS1650XHandler.h"
-#include "mission/utility/TmFunnel.h"
+#include "mission/tmtc/TmFunnel.h"
 #include "objects/systemObjectList.h"
 #include "tmtc/apid.h"
 #include "tmtc/pusIds.h"
diff --git a/fsfw b/fsfw
index 6a62cf7f..904ae2cc 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 6a62cf7f1e47d627346916f3605829118ffd8357
+Subproject commit 904ae2cc0ef61706a385d498942154da4f923a18
diff --git a/tmtc b/tmtc
index 87d539d4..370d6c2f 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 87d539d46eba64569e550f5873e176f31fce1542
+Subproject commit 370d6c2fa4e9c84d96d23cbae6711cdf68cdd465