From 19269a605229d9ec51511a790413d4731470fefa Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 21 Jun 2021 16:54:33 +0200
Subject: [PATCH] fixes for updated fsfw

---
 bsp_linux_board/ObjectFactory.cpp | 2 +-
 fsfw                              | 2 +-
 linux/fsfwconfig/FSFWConfig.h.in  | 4 ++++
 mission/utility/TmFunnel.cpp      | 3 +--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bsp_linux_board/ObjectFactory.cpp b/bsp_linux_board/ObjectFactory.cpp
index adc50dd0..d6dfd623 100644
--- a/bsp_linux_board/ObjectFactory.cpp
+++ b/bsp_linux_board/ObjectFactory.cpp
@@ -21,7 +21,7 @@
 #include "fsfw/datapoollocal/LocalDataPoolManager.h"
 #include "fsfw/tmtcservices/CommandingServiceBase.h"
 #include "fsfw/tmtcservices/PusServiceBase.h"
-#include "fsfw/tmtcpacket/pus/TmPacketStored.h"
+#include "fsfw/tmtcpacket/pus/tm.h"
 #include "fsfw/tasks/TaskFactory.h"
 
 /* UDP server includes */
diff --git a/fsfw b/fsfw
index 5f9a6bb1..cae69d54 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 5f9a6bb155eb59981e7ff851b7efaa1ae25e42b4
+Subproject commit cae69d540097acba46bffa47fd7afc6a8a19bd15
diff --git a/linux/fsfwconfig/FSFWConfig.h.in b/linux/fsfwconfig/FSFWConfig.h.in
index 8ec01cb9..a8519cff 100644
--- a/linux/fsfwconfig/FSFWConfig.h.in
+++ b/linux/fsfwconfig/FSFWConfig.h.in
@@ -18,6 +18,7 @@
 #endif
 
 #define FSFW_USE_PUS_C_TELEMETRY    1
+#define FSFW_USE_PUS_C_TELECOMMANDS 1
 
 //! Can be used to disable the ANSI color sequences for C stdio.
 #define FSFW_COLORED_OUTPUT 		1
@@ -66,6 +67,9 @@ static constexpr size_t FSFW_EVENTMGMR_RANGEMATCHERS   = 120;
 static constexpr uint8_t FSFW_CSB_FIFO_DEPTH = 6;
 
 static constexpr size_t FSFW_PRINT_BUFFER_SIZE = 124;
+
+static constexpr size_t FSFW_MAX_TM_PACKET_SIZE = 2048;
+
 }
 
 #define FSFW_HAL_LINUX_SPI_WIRETAPPING  0
diff --git a/mission/utility/TmFunnel.cpp b/mission/utility/TmFunnel.cpp
index 72c41153..c52fa6f9 100644
--- a/mission/utility/TmFunnel.cpp
+++ b/mission/utility/TmFunnel.cpp
@@ -1,8 +1,7 @@
 #include <fsfw/ipc/QueueFactory.h>
-#include <fsfw/tmtcpacket/pus/TmPacketStored.h>
+#include <fsfw/tmtcpacket/pus/tm.h>
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
-#include <fsfw/tmtcpacket/pus/TmPacketPusC.h>
 #include <mission/utility/TmFunnel.h>
 
 object_id_t TmFunnel::downlinkDestination = objects::NO_OBJECT;