src/fsfw/CMakeLists.txt

@@ -31,6 +31,7 @@ add_subdirectory(thermal)
 add_subdirectory(timemanager)
 add_subdirectory(tmtcpacket)
 add_subdirectory(tmtcservices)
+add_subdirectory(filesystem)
 
 # Optional
 

src/fsfw/cfdp/handler/DestHandler.cpp

@@ -2,4 +2,5 @@
 
 #include <utility>
 
-cfdp::DestHandler::DestHandler(LocalEntityCfg cfg) : cfg(std::move(cfg)) {}
+cfdp::DestHandler::DestHandler(LocalEntityCfg cfg, UserBase& user)
+    : cfg(std::move(cfg)), user(user) {}

src/fsfw/cfdp/handler/DestHandler.h

@@ -1,6 +1,7 @@
 #ifndef FSFW_CFDP_CFDPDESTHANDLER_H
 #define FSFW_CFDP_CFDPDESTHANDLER_H
 
+#include "UserBase.h"
 #include "fsfw/cfdp/handler/mib.h"
 #include "fsfw/cfdp/pdu/PduConfig.h"
 
@@ -8,10 +9,11 @@ namespace cfdp {
 
 class DestHandler {
  public:
-  DestHandler(LocalEntityCfg cfg /*, CfdpUserBase& user, RemoteConfigTableIF& remoteConfigTable*/);
+  DestHandler(LocalEntityCfg cfg, UserBase& user /*, RemoteConfigTableIF& remoteConfigTable*/);
 
  private:
   LocalEntityCfg cfg;
+  UserBase& user;
 };
 
 }  // namespace cfdp

src/fsfw/cfdp/handler/UserBase.h

@@ -1,7 +1,7 @@
 #ifndef FSFW_CFDP_USERBASE_H
 #define FSFW_CFDP_USERBASE_H
 
-#include "fsfw/memory/HasFileSystemIF.h"
+#include "fsfw/filesystem/HasFileSystemIF.h"
 
 namespace cfdp {
 

src/fsfw/cfdp/handler/mib.h

@@ -3,8 +3,8 @@
 
 #include <utility>
 
-#include "fsfw/cfdp/pdu/PduConfig.h"
 #include "FaultHandlerBase.h"
+#include "fsfw/cfdp/pdu/PduConfig.h"
 
 namespace cfdp {
 

src/fsfw/filesystem.h

@@ -0,0 +1,7 @@
+#ifndef FSFW_FILESYSTEM_H
+#define FSFW_FILESYSTEM_H
+
+#include "filesystem/FileSystemArgsIF.h"
+#include "filesystem/HasFileSystemIF.h"
+
+#endif  // FSFW_FILESYSTEM_H

src/fsfw/filesystem/CMakeLists.txt

@@ -0,0 +1 @@
+target_sources(${LIB_FSFW_NAME} PRIVATE GenericFileSystemMessage.cpp)

src/fsfw/filesystem/GenericFileSystemMessage.cpp

@@ -1,4 +1,4 @@
-#include "fsfw/memory/GenericFileSystemMessage.h"
+#include "GenericFileSystemMessage.h"
 
 #include "fsfw/objectmanager/ObjectManager.h"
 #include "fsfw/storagemanager/StorageManagerIF.h"

src/fsfw/ipc/CommandMessageCleaner.cpp

@@ -1,10 +1,9 @@
 #include "fsfw/ipc/CommandMessageCleaner.h"
 
-#include "fsfw/FSFW.h"
 #include "fsfw/devicehandlers/DeviceHandlerMessage.h"
+#include "fsfw/filesystem/GenericFileSystemMessage.h"
 #include "fsfw/health/HealthMessage.h"
 #include "fsfw/housekeeping/HousekeepingMessage.h"
-#include "fsfw/memory/GenericFileSystemMessage.h"
 #include "fsfw/memory/MemoryMessage.h"
 #include "fsfw/modes/ModeMessage.h"
 #include "fsfw/monitoring/MonitoringMessage.h"

src/fsfw/memory/CMakeLists.txt

@@ -1,2 +1 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE MemoryHelper.cpp MemoryMessage.cpp
+target_sources(${LIB_FSFW_NAME} PRIVATE MemoryHelper.cpp MemoryMessage.cpp)
-                                        GenericFileSystemMessage.cpp)

unittests/cfdp/handler/testDestHandler.cpp

@@ -1,10 +1,13 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include "fsfw/cfdp.h"
+#include "mocks/CfdpFaultHandlerMock.h"
 
 TEST_CASE("CFDP Dest Handler", "[cfdp]") {
   using namespace cfdp;
-  // auto localEntityCfg = LocalEntityCfg();
+  EntityId localId = EntityId(UnsignedByteField<uint16_t>(2));
+  auto fhMock = CfdpFaultHandlerMock();
+  auto localEntityCfg = LocalEntityCfg(localId, IndicationCfg(), fhMock);
   // auto destHandler = DestHandler();
 
   SECTION("State") {}