bsp_q7s/CMakeLists.txt

@@ -24,3 +24,4 @@ endif()
 add_subdirectory(memory)
 add_subdirectory(callbacks)
 add_subdirectory(xadc)
+add_subdirectory(fs)

bsp_q7s/boardtest/Q7STestTask.cpp

@@ -17,7 +17,7 @@
 #include <nlohmann/json.hpp>
 
 #include "OBSWConfig.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "bsp_q7s/memory/scratchApi.h"
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/timemanager/Stopwatch.h"

bsp_q7s/core/CoreController.cpp

@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <filesystem>
 
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "bsp_q7s/memory/scratchApi.h"
 #include "bsp_q7s/xadc/Xadc.h"
 #include "linux/utility/utility.h"

bsp_q7s/core/CoreController.h

@@ -7,7 +7,7 @@
 #include <cstddef>
 
 #include "CoreDefinitions.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "events/subsystemIdRanges.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "mission/devices/devicedefinitions/GPSDefinitions.h"

bsp_q7s/fs/CMakeLists.txt

@@ -0,0 +1,2 @@
+target_sources(${OBSW_NAME} PRIVATE helpers.cpp SdCardManager.cpp
+                                    FilesystemHelper.cpp)

bsp_q7s/fs/FilesystemHelper.cpp

@@ -3,8 +3,8 @@
 #include <filesystem>
 #include <fstream>
 
-#include "bsp_q7s/memory/SdCardManager.h"
-#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
+#include "SdCardManager.h"
+#include "fsfw/serviceinterface.h"
 
 FilesystemHelper::FilesystemHelper() {}
 

bsp_q7s/fs/SdCardManager.cpp

@@ -10,11 +10,11 @@
 #include <memory>
 
 #include "OBSWConfig.h"
+#include "bsp_q7s/memory/scratchApi.h"
 #include "common/config/commonObjects.h"
 #include "fsfw/ipc/MutexFactory.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "linux/utility/utility.h"
-#include "scratchApi.h"
 
 SdCardManager* SdCardManager::INSTANCE = nullptr;
 

bsp_q7s/fs/helpers.h

@@ -1,10 +1,10 @@
 #ifndef BSP_Q7S_MEMORY_HELPERS_H_
 #define BSP_Q7S_MEMORY_HELPERS_H_
 
-#include <bsp_q7s/memory/SdCardManager.h>
-
 #include <filesystem>
 
+#include "SdCardManager.h"
+
 namespace fshelpers {
 
 std::filesystem::path buildPrefixedPath(SdCardManager& man,

bsp_q7s/memory/CMakeLists.txt

@@ -1,2 +1 @@
-target_sources(${OBSW_NAME} PRIVATE helpers.cpp SdCardManager.cpp
-                                    scratchApi.cpp FilesystemHelper.cpp)
+target_sources(${OBSW_NAME} PRIVATE scratchApi.cpp)

linux/devices/ploc/PlocMPSoCHelper.cpp

@@ -5,7 +5,7 @@
 
 #include "OBSWConfig.h"
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/FilesystemHelper.h"
+#include "bsp_q7s/fs/FilesystemHelper.h"
 #endif
 
 #include "mission/utility/Timestamp.h"

linux/devices/ploc/PlocMPSoCHelper.h

@@ -12,7 +12,7 @@
 #include "fsfw_hal/linux/uart/UartComIF.h"
 #include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h"
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #endif
 
 /**

linux/devices/ploc/PlocMemoryDumper.h

@@ -5,7 +5,7 @@
 #include <linux/devices/devicedefinitions/PlocSupervisorDefinitions.h>
 
 #include "OBSWConfig.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "fsfw/action/ActionHelper.h"
 #include "fsfw/action/CommandActionHelper.h"
 #include "fsfw/action/CommandsActionsIF.h"

linux/devices/ploc/PlocSupervisorHandler.h

@@ -3,7 +3,7 @@
 
 #include "OBSWConfig.h"
 #include "PlocSupvHelper.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "devices/powerSwitcherList.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "fsfw/timemanager/Countdown.h"

linux/devices/ploc/PlocSupvHelper.cpp

@@ -8,8 +8,8 @@
 
 #include "OBSWConfig.h"
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/FilesystemHelper.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/FilesystemHelper.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #endif
 
 #include "fsfw/tasks/TaskFactory.h"

linux/devices/ploc/PlocSupvHelper.h

@@ -13,7 +13,7 @@
 #include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
 
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #endif
 
 /**

linux/devices/startracker/StrHelper.h

@@ -7,7 +7,7 @@
 #include "OBSWConfig.h"
 
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #endif
 
 #include "fsfw/devicehandlers/CookieIF.h"