Skip to content

Commit

Permalink
Fix formatting and add header to iwyu
Browse files Browse the repository at this point in the history
  • Loading branch information
danielschloms committed May 27, 2024
1 parent e2db5e1 commit 7ae6ac9
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
4 changes: 3 additions & 1 deletion Sts1CobcSw/FileSystem/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ else()
target_sources(Sts1CobcSw_FileSystem PRIVATE LfsRam.cpp)
target_sources(Sts1CobcSw_FileSystem_NoRodos PRIVATE LfsRam.cpp)
target_sources(Sts1CobcSw_FileSystem PRIVATE LfsWrapper.cpp)
target_link_libraries(Sts1CobcSw_FileSystem_NoRodos PUBLIC littlefs::littlefs Sts1CobcSw_Outcome)
target_link_libraries(
Sts1CobcSw_FileSystem_NoRodos PUBLIC littlefs::littlefs Sts1CobcSw_Outcome
)
target_link_libraries(Sts1CobcSw_FileSystem_NoRodos PRIVATE Sts1CobcSw_Serial)
target_compile_definitions(Sts1CobcSw_FileSystem_NoRodos PRIVATE NO_RODOS LFS_THREADSAFE)
endif()
2 changes: 1 addition & 1 deletion Sts1CobcSw/FileSystem/LfsFlash.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ auto Read(lfs_config const * config,
return 0;
}


auto Program(lfs_config const * config,
lfs_block_t blockNo,
lfs_off_t offset,
Expand Down Expand Up @@ -137,7 +138,6 @@ auto Sync([[maybe_unused]] lfs_config const * config) -> int
auto Lock(const struct lfs_config * config) -> int
{
return 0;

}


Expand Down
4 changes: 3 additions & 1 deletion Tests/UnitTests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ target_link_libraries(

# TODO: Enable again once problem with segmentation violation on CI is fixed
add_program(LfsRam LfsRam.test.cpp)
target_link_libraries(Sts1CobcSwTests_LfsRam PRIVATE Catch2::Catch2WithMain Sts1CobcSw_FileSystem_NoRodos)
target_link_libraries(
Sts1CobcSwTests_LfsRam PRIVATE Catch2::Catch2WithMain Sts1CobcSw_FileSystem_NoRodos
)

add_program(Outcome Outcome.test.cpp)
target_link_libraries(Sts1CobcSwTests_Outcome PRIVATE Catch2::Catch2WithMain)
Expand Down
4 changes: 3 additions & 1 deletion Tests/UnitTests/NoCatch2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# No Catch2, since RODOS (main) is needed
add_program(LfsRamCustomSemaphore LfsRamCustomSemaphore.test.cpp)
target_link_libraries(Sts1CobcSwTests_LfsRamCustomSemaphore PRIVATE rodos::rodos Sts1CobcSw_FileSystem)
target_link_libraries(
Sts1CobcSwTests_LfsRamCustomSemaphore PRIVATE rodos::rodos Sts1CobcSw_FileSystem
)

add_program(LockCollision LockCollision.test.cpp)
target_link_libraries(Sts1CobcSwTests_LockCollision PRIVATE rodos::rodos Sts1CobcSw_FileSystem)
2 changes: 1 addition & 1 deletion Tests/UnitTests/NoCatch2/LockCollision.test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ using RODOS::PRINTF;
class LockingThread : public RODOS::StaticThread<>
{
public:
explicit LockingThread(const char * threadName) : StaticThread(threadName)
explicit LockingThread(char const * threadName) : StaticThread(threadName)
{
}

Expand Down
1 change: 1 addition & 0 deletions iwyu.imp
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
{ include: ["\"Sts1CobcSw/Utility/FlatArray.hpp\"", "public", "<Sts1CobcSw/Utility/FlatArray.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Utility/Span.hpp\"", "public", "<Sts1CobcSw/Utility/Span.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Utility/Time.hpp\"", "public", "<Sts1CobcSw/Utility/Time.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Utility/LinuxSemaphore.hpp\"", "public", "<Sts1CobcSw/Utility/LinuxSemaphore.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/CommandParser.hpp\"", "public", "<Sts1CobcSw/CommandParser.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/EduCommunicationErrorThread.hpp\"", "public", "<Sts1CobcSw/EduCommunicationErrorThread.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/EduListenerThread.hpp\"", "public", "<Sts1CobcSw/EduListenerThread.hpp>", "public"] },
Expand Down

0 comments on commit 7ae6ac9

Please sign in to comment.