eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

new fs helper module
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2022-09-16 11:53:33 +02:00
parent 38f435d1ae
commit 26216eca88
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
19 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bsp_q7s/CMakeLists.txt
View File

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

2
bsp_q7s/boardtest/Q7STestTask.cpp
View File

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

2
bsp_q7s/core/CoreController.cpp
View File

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

2
bsp_q7s/core/CoreController.h
View File

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

2
bsp_q7s/fs/CMakeLists.txt Normal file
View File

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

4
bsp_q7s/memory/FilesystemHelper.cpp → bsp_q7s/fs/FilesystemHelper.cpp
View File

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

0
bsp_q7s/memory/FilesystemHelper.h → bsp_q7s/fs/FilesystemHelper.h
View File

2
bsp_q7s/memory/SdCardManager.cpp → bsp_q7s/fs/SdCardManager.cpp
View File

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

0
bsp_q7s/memory/SdCardManager.h → bsp_q7s/fs/SdCardManager.h
View File

0
bsp_q7s/memory/helpers.cpp → bsp_q7s/fs/helpers.cpp
View File

4
bsp_q7s/memory/helpers.h → bsp_q7s/fs/helpers.h
View File

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

3
bsp_q7s/memory/CMakeLists.txt
View File

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

2
linux/devices/ploc/PlocMPSoCHelper.cpp
View File

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

2
linux/devices/ploc/PlocMPSoCHelper.h
View File

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

2
linux/devices/ploc/PlocMemoryDumper.h
View File

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

2
linux/devices/ploc/PlocSupervisorHandler.h
View File

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

4
linux/devices/ploc/PlocSupvHelper.cpp
View File

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

2
linux/devices/ploc/PlocSupvHelper.h
View File

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

2
linux/devices/startracker/StrHelper.h
View File

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