🔀 Merge branch 'ladislas/yann/feature/videokit/remove-CoreFatFs-CoreF…

…s' into develop
leka · Mar 15, 2022 · a6ea6df · a6ea6df
2 parents ecf5db3 + 3259824
commit a6ea6df
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 158 deletions.
diff --git a/Makefile b/Makefile
@@ -53,8 +53,8 @@ CMAKE_TOOLS_CONFIG_DIR := $(CMAKE_TOOLS_BUILD_DIR)/cmake_config
 # MARK: - Coverage exclusions
 #
 
-EXCLUDE_FROM_GCOVR_COVERAGE = -e '.*_build.*' -e '.*extern.*' -e '.*tests/unit.*' -e '.*_test.*\.cpp' -e '.*CoreSTM32Hal.*' -e '.*CoreFatFs.*' -e '.*include/boost.*' -e '.*CoreTicker.*' -e '.*CoreTimeout.*'
-EXCLUDE_FROM_LCOV_COVERAGE  = '*Xcode*' '*_build*' '*extern*' '*tests/unit*' '*_test*.cpp' '*CoreSTM32Hal*' '*CoreFatFs*' '*include/boost*' '.*CoreTicker.*' '.*CoreTimeout.*'
+EXCLUDE_FROM_GCOVR_COVERAGE = -e '.*_build.*' -e '.*extern.*' -e '.*tests/unit.*' -e '.*_test.*\.cpp' -e '.*CoreSTM32Hal.*' -e '.*include/boost.*' -e '.*CoreTicker.*' -e '.*CoreTimeout.*'
+EXCLUDE_FROM_LCOV_COVERAGE  = '*Xcode*' '*_build*' '*extern*' '*tests/unit*' '*_test*.cpp' '*CoreSTM32Hal*' '*include/boost*' '.*CoreTicker.*' '.*CoreTimeout.*'
 
 #
 # MARK: - .bin path

diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt
@@ -5,7 +5,6 @@
 # C++ wrappers & low level drivers
 add_subdirectory(${DRIVERS_DIR}/CoreBufferedSerial)
 add_subdirectory(${DRIVERS_DIR}/CoreEventQueue)
-add_subdirectory(${DRIVERS_DIR}/CoreFs)
 add_subdirectory(${DRIVERS_DIR}/CoreI2C)
 add_subdirectory(${DRIVERS_DIR}/CoreLL)
 add_subdirectory(${DRIVERS_DIR}/CoreMCU)

diff --git a/drivers/CoreFs/CMakeLists.txt b/drivers/CoreFs/CMakeLists.txt
diff --git a/drivers/CoreFs/include/CoreFatFs.h b/drivers/CoreFs/include/CoreFatFs.h
diff --git a/drivers/CoreFs/source/CoreFatFs.cpp b/drivers/CoreFs/source/CoreFatFs.cpp
diff --git a/drivers/CoreVideo/CMakeLists.txt b/drivers/CoreVideo/CMakeLists.txt
@@ -30,7 +30,7 @@ target_link_libraries(CoreVideo
 		mbed-os
 		CoreLL
 		CoreSTM32Hal
-		CoreFs
+		FileSystemKit
 )
 
 if (${CMAKE_PROJECT_NAME} STREQUAL "LekaOSUnitTests")

diff --git a/include/interface/platform/FatFs.h b/include/interface/platform/FatFs.h
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -42,7 +42,6 @@ sonar.cpd.exclusions=\
 
 sonar.coverage.exclusions=\
 	drivers/FastLED/**/*,\
-	drivers/CoreFatFs/**/*,\
 	drivers/CoreSTM32Hal/**/*,\
 	extern/**/*,\
 	**/*extern*/**/*,\

diff --git a/spikes/lk_cg_animations/CMakeLists.txt b/spikes/lk_cg_animations/CMakeLists.txt
@@ -15,10 +15,10 @@ target_sources(spike_lk_cg_animations
 )
 
 target_link_libraries(spike_lk_cg_animations
-	CoreFs
 	CoreVideo
 	CoreLL
 	CoreSTM32Hal
+	FileSystemKit
 	UIAnimationKit
 )
 

diff --git a/spikes/lk_cg_animations/main.cpp b/spikes/lk_cg_animations/main.cpp
@@ -11,7 +11,6 @@
 #include "BouncingSquare.h"
 #include "CoreDMA2D.hpp"
 #include "CoreDSI.hpp"
-#include "CoreFatFs.h"
 #include "CoreFont.hpp"
 #include "CoreGraphics.hpp"
 #include "CoreJPEG.hpp"
@@ -23,6 +22,7 @@
 #include "CoreSTM32Hal.h"
 #include "CoreVideo.hpp"
 #include "FATFileSystem.h"
+#include "FileSystemKit.h"
 #include "HelloWorld.h"
 #include "LogKit.h"
 #include "SDBlockDevice.h"

diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
@@ -222,7 +222,6 @@ leka_register_unit_tests_for_driver(CoreBattery)
 leka_register_unit_tests_for_driver(CoreBufferedSerial)
 leka_register_unit_tests_for_driver(CoreEventQueue)
 leka_register_unit_tests_for_driver(CoreFlashMemory)
-leka_register_unit_tests_for_driver(CoreFs)
 leka_register_unit_tests_for_driver(CoreHTS)
 leka_register_unit_tests_for_driver(CoreI2C)
 leka_register_unit_tests_for_driver(CoreLED)

diff --git a/tests/unit/mocks/mocks/leka/CoreFatFs.h b/tests/unit/mocks/mocks/leka/CoreFatFs.h