Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move and rename RingArray files #324

Merged
merged 2 commits into from
Sep 15, 2024
Merged

Move and rename RingArray files #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1d9b5a
Move `FramRingArray.[hi]pp` to `FramSections/`
PatrickKa Sep 15, 2024
c642f08
Rename `FramRingArray.[hi]pp` to `RingArray.[hi]pp`
PatrickKa Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Sts1CobcSw/Periphery/FramRingArray.hpp → Sts1CobcSw/FramSections/RingArray.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
#include <span>


// TODO: Add cache in case the FRAM is not working
// TODO: Move to FramSections
namespace sts1cobcsw
{
template<typename T, Section ringArraySection, std::size_t nCachedElements>
Expand Down Expand Up @@ -77,4 +75,4 @@ class RingArray
}


#include <Sts1CobcSw/Periphery/FramRingArray.ipp> // IWYU pragma: keep
#include <Sts1CobcSw/FramSections/RingArray.ipp> // IWYU pragma: keep
2 changes: 1 addition & 1 deletion Sts1CobcSw/Periphery/FramRingArray.ipp → Sts1CobcSw/FramSections/RingArray.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once


#include <Sts1CobcSw/Periphery/FramRingArray.hpp>
#include <Sts1CobcSw/FramSections/RingArray.hpp>
#include <Sts1CobcSw/Utility/Debug.hpp>
#include <Sts1CobcSw/Utility/Span.hpp>

Expand Down
4 changes: 2 additions & 2 deletions Tests/UnitTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ add_test(NAME PersistentVariables COMMAND Sts1CobcSwTests_PersistentVariables)

add_program(FramRingArray FramRingArray.test.cpp UnitTestThread.cpp)
target_link_libraries(
Sts1CobcSwTests_FramRingArray PRIVATE rodos::rodos Sts1CobcSw_Periphery Sts1CobcSw_Serial
Sts1CobcSw_Edu
Sts1CobcSwTests_FramRingArray PRIVATE rodos::rodos Sts1CobcSw_FramSections Sts1CobcSw_Periphery
Sts1CobcSw_Serial
)
add_test(NAME FramRingArray COMMAND Sts1CobcSwTests_FramRingArray)

Expand Down
2 changes: 1 addition & 1 deletion Tests/UnitTests/FramRingArray.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include <Tests/UnitTests/UnitTestThread.hpp>

#include <Sts1CobcSw/FramSections/RingArray.hpp>
#include <Sts1CobcSw/FramSections/Section.hpp>
#include <Sts1CobcSw/Periphery/Fram.hpp>
#include <Sts1CobcSw/Periphery/FramMock.hpp>
#include <Sts1CobcSw/Periphery/FramRingArray.hpp>
#include <Sts1CobcSw/Serial/Byte.hpp>
#include <Sts1CobcSw/Utility/ErrorDetectionAndCorrection.hpp>

Expand Down
4 changes: 2 additions & 2 deletions iwyu.imp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
# Instead of all our .ipp files include the .hpp ones
{ include: ["\"Sts1CobcSw/Edu/Types.ipp\"", "private", "<Sts1CobcSw/Edu/Types.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/FileSystem/FileSystem.ipp\"", "private", "<Sts1CobcSw/FileSystem/FileSystem.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/FramSections/RingArray.ipp\"", "private", "<Sts1CobcSw/FramSections/RingArray.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/FramSections/PersistentVariables.ipp\"", "private", "<Sts1CobcSw/FramSections/PersistentVariables.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/FramSections/Subsections.ipp\"", "private", "<Sts1CobcSw/FramSections/Subsections.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Hal/GpioPin.ipp\"", "private", "<Sts1CobcSw/Hal/GpioPin.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Hal/Spi.ipp\"", "private", "<Sts1CobcSw/Hal/Spi.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Hal/Uart.ipp\"", "private", "<Sts1CobcSw/Hal/Uart.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Periphery/Fram.ipp\"", "private", "<Sts1CobcSw/Periphery/Fram.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Periphery/FramRingArray.ipp\"", "private", "<Sts1CobcSw/Periphery/FramRingArray.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/ProgramId/ProgramId.ipp\"", "private", "<Sts1CobcSw/ProgramId/ProgramId.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Serial/Byte.ipp\"", "private", "<Sts1CobcSw/Serial/Byte.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Serial/Serial.ipp\"", "private", "<Sts1CobcSw/Serial/Serial.hpp>", "public"] },
Expand All @@ -73,6 +73,7 @@
{ include: ["\"Sts1CobcSw/FileSystem/LfsStorageDevice.hpp\"", "public", "<Sts1CobcSw/FileSystem/LfsStorageDevice.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/FileSystem/LfsWrapper.hpp\"", "public", "<Sts1CobcSw/FileSystem/LfsWrapper.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/FramSections/FramLayout.hpp\"", "public", "<Sts1CobcSw/FramSections/FramLayout.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/FramSections/RingArray.hpp\"", "public", "<Sts1CobcSw/FramSections/RingArray.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/FramSections/PersistentVariableInfo.hpp\"", "public", "<Sts1CobcSw/FramSections/PersistentVariableInfo.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/FramSections/PersistentVariables.hpp\"", "public", "<Sts1CobcSw/FramSections/PersistentVariables.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/FramSections/Section.hpp\"", "public", "<Sts1CobcSw/FramSections/Section.hpp>", "public"] },
Expand All @@ -89,7 +90,6 @@
{ include: ["\"Sts1CobcSw/Periphery/Fram.hpp\"", "public", "<Sts1CobcSw/Periphery/Fram.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Periphery/FramEpsSpi.hpp\"", "public", "<Sts1CobcSw/Periphery/FramEpsSpi.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Periphery/FramMock.hpp\"", "public", "<Sts1CobcSw/Periphery/FramMock.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Periphery/FramRingArray.hpp\"", "public", "<Sts1CobcSw/Periphery/FramRingArray.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Periphery/Rf.hpp\"", "public", "<Sts1CobcSw/Periphery/Rf.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/ProgramId/ProgramId.hpp\"", "public", "<Sts1CobcSw/ProgramId/ProgramId.hpp>", "public"] },
{ include: ["\"Sts1CobcSw/Serial/Byte.hpp\"", "public", "<Sts1CobcSw/Serial/Byte.hpp>", "public"] },
Expand Down