Fix merge conflict

CMakePresets.json

@@ -47,7 +47,7 @@
       "name": "include-what-you-use",
       "hidden": true,
       "cacheVariables": {
-        "CMAKE_CXX_INCLUDE_WHAT_YOU_USE": "include-what-you-use;-Xiwyu;--mapping_file=${sourceDir}/iwyu.imp"
+        "CMAKE_CXX_INCLUDE_WHAT_YOU_USE": "include-what-you-use;-Xiwyu;--mapping_file=${sourceDir}/iwyu.imp;-Xiwyu;--no_fwd_decls"
       }
     },
     {

Sts1CobcSw/CommandParser.cpp

@@ -1,5 +1,6 @@
 #include <Sts1CobcSw/CommandParser.hpp>
 #include <Sts1CobcSw/Edu/Edu.hpp>
+#include <Sts1CobcSw/Edu/ProgramQueue.hpp>
 #include <Sts1CobcSw/EduProgramQueueThread.hpp>
 #include <Sts1CobcSw/Utility/Time.hpp>
 

Sts1CobcSw/CommandParser.hpp

@@ -4,6 +4,7 @@
 
 #include <etl/vector.h>
 
+#include <bit>
 #include <cstddef>
 #include <cstdint>
 #include <span>

Sts1CobcSw/Edu/Edu.cpp

@@ -4,16 +4,17 @@
 #include <Sts1CobcSw/Hal/IoNames.hpp>
 #include <Sts1CobcSw/Hal/Uart.hpp>
 #include <Sts1CobcSw/Periphery/PersistentState.hpp>
+#include <Sts1CobcSw/Serial/Byte.hpp>
 #include <Sts1CobcSw/Serial/Serial.hpp>
 #include <Sts1CobcSw/Utility/Crc32.hpp>
 #include <Sts1CobcSw/Utility/Span.hpp>
 
+#include <rodos_no_using_namespace.h>
+
 #include <etl/vector.h>
 
-#include <algorithm>
 #include <array>
-#include <cinttypes>
-#include <cstddef>
+#include <span>
 
 
 namespace sts1cobcsw::edu

Sts1CobcSw/Edu/Edu.hpp

@@ -3,9 +3,6 @@
 
 #include <Sts1CobcSw/Edu/Types.hpp>
 #include <Sts1CobcSw/Outcome/Outcome.hpp>
-#include <Sts1CobcSw/Serial/Byte.hpp>
-
-#include <rodos_no_using_namespace.h>
 
 #include <cstdint>
 

Sts1CobcSw/Edu/ProgramQueue.cpp

@@ -1,6 +1,5 @@
 #include <Sts1CobcSw/Edu/ProgramQueue.hpp>
-
-#include <rodos_no_using_namespace.h>
+#include <Sts1CobcSw/Serial/Serial.hpp>
 
 
 // TODO: Change namespace here too, or move it back to Sts1CobSw/

Sts1CobcSw/Edu/ProgramQueue.hpp

@@ -4,15 +4,14 @@
 // clang-format off
 #include <cstdint>
 // ringbuffer.h does not include <cstdint> even though it requires it
-#include <rodos/support/support-libs/ringbuffer.h>
+// #include <rodos/support/support-libs/ringbuffer.h>
 // clang-format on
 
-#include <Sts1CobcSw/Serial/Byte.hpp>
 #include <Sts1CobcSw/Serial/Serial.hpp>
 
-#include <etl/string.h>
 #include <etl/vector.h>
 
+#include <bit>
 #include <cstddef>
 
 

Sts1CobcSw/EduHeartbeatThread.cpp

@@ -1,4 +1,3 @@
-#include <Sts1CobcSw/Edu/Edu.hpp>
 #include <Sts1CobcSw/Hal/GpioPin.hpp>
 #include <Sts1CobcSw/Hal/IoNames.hpp>
 #include <Sts1CobcSw/ThreadPriorities.hpp>

Sts1CobcSw/EduProgramQueueThread.cpp

@@ -4,15 +4,18 @@
 #include <Sts1CobcSw/Edu/Types.hpp>
 #include <Sts1CobcSw/EduCommunicationErrorThread.hpp>
 #include <Sts1CobcSw/EduProgramQueueThread.hpp>
-#include <Sts1CobcSw/Serial/Byte.hpp>
 #include <Sts1CobcSw/ThreadPriorities.hpp>
 #include <Sts1CobcSw/TopicsAndSubscribers.hpp>
 #include <Sts1CobcSw/Utility/Time.hpp>
 
+#include <rodos/support/support-libs/ringbuffer.h>
 #include <rodos_no_using_namespace.h>
 
+#include <etl/vector.h>
+
 #include <algorithm>
 #include <cinttypes>
+#include <cstdint>
 
 
 namespace sts1cobcsw

Sts1CobcSw/FileSystem/FileSystem.cpp

@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <array>
+#include <iterator>
 #include <span>
 
 

Sts1CobcSw/FileSystem/FileSystem.hpp

@@ -37,4 +37,4 @@ auto Ls(char const * path) -> int;
 }
 
 
-#include <Sts1CobcSw/FileSystem/FileSystem.ipp>
+#include <Sts1CobcSw/FileSystem/FileSystem.ipp>  // IWYU pragma: keep

Sts1CobcSw/FileSystem/FileSystem.ipp

@@ -1,7 +1,7 @@
 #pragma once
 
 
-#include <Sts1CobcSw/FileSystem/FileSystem.hpp>
+#include <Sts1CobcSw/FileSystem/FileSystem.hpp>  // IWYU pragma: keep
 
 
 namespace sts1cobcsw::fs

Sts1CobcSw/Hal/Spi.cpp

@@ -1,5 +1,7 @@
 #include <Sts1CobcSw/Hal/Spi.hpp>
 
+#include <rodos_no_using_namespace.h>
+
 
 namespace sts1cobcsw::hal
 {

Sts1CobcSw/Hal/Spi.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <rodos_no_using_namespace.h>
 
 #include <cstddef>
@@ -22,4 +21,4 @@ auto ReadFrom(RODOS::HAL_SPI * spi, std::span<T, extent> data) -> void;
 }
 
 
-#include <Sts1CobcSw/Hal/Spi.ipp>
+#include <Sts1CobcSw/Hal/Spi.ipp>  // IWYU pragma: keep

Sts1CobcSw/Hal/Spi.ipp

@@ -3,6 +3,8 @@
 
 #include <Sts1CobcSw/Hal/Spi.hpp>
 
+#include <rodos_no_using_namespace.h>  // IWYU pragma: keep
+
 
 namespace sts1cobcsw::hal
 {
@@ -24,4 +26,4 @@ inline auto ReadFrom(RODOS::HAL_SPI * spi, std::span<T, extent> data) -> void
     // return value at runtime.
     spi->read(data.data(), data.size_bytes());
 }
-}
+}

Sts1CobcSw/Hal/Uart.cpp

@@ -1,5 +1,7 @@
 #include <Sts1CobcSw/Hal/Uart.hpp>
 
+#include <rodos_no_using_namespace.h>
+
 
 namespace sts1cobcsw::hal
 {

Sts1CobcSw/Hal/Uart.hpp

@@ -42,4 +42,4 @@ template<typename T, std::size_t extent>
 }
 
 
-#include <Sts1CobcSw/Hal/Uart.ipp>
+#include <Sts1CobcSw/Hal/Uart.ipp>  // IWYU pragma: keep

Sts1CobcSw/HelloDummy.cpp

@@ -2,8 +2,7 @@
 
 #include <rodos_no_using_namespace.h>
 
-#include <span>
-#include <string_view>
+#include <etl/string.h>
 
 
 namespace RODOS

Sts1CobcSw/Periphery/Flash.cpp

@@ -8,9 +8,9 @@
 
 #include <rodos_no_using_namespace.h>
 
-#include <algorithm>
+#include <array>
 #include <bit>
-#include <string_view>
+#include <tuple>
 
 
 namespace sts1cobcsw

Sts1CobcSw/Periphery/Flash.hpp

@@ -4,6 +4,7 @@
 #include <Sts1CobcSw/Serial/Byte.hpp>
 
 #include <array>
+#include <cstddef>
 #include <cstdint>
 #include <span>
 

Sts1CobcSw/Periphery/Fram.hpp

@@ -41,4 +41,4 @@ auto ReadFrom(Address address, void * data, std::size_t nBytes) -> void;
 }
 
 
-#include <Sts1CobcSw/Periphery/Fram.ipp>
+#include <Sts1CobcSw/Periphery/Fram.ipp>  // IWYU pragma: keep

Sts1CobcSw/Periphery/Rf.cpp

@@ -8,7 +8,10 @@
 
 #include <array>
 #include <climits>
+#include <cstddef>
+#include <iterator>
 #include <span>
+#include <type_traits>
 
 
 namespace sts1cobcsw::periphery::rf

Sts1CobcSw/Serial/Byte.hpp

@@ -15,4 +15,4 @@ constexpr auto operator"" _b(unsigned long long number) -> Byte;
 }
 
 
-#include <Sts1CobcSw/Serial/Byte.ipp>
+#include <Sts1CobcSw/Serial/Byte.ipp>  // IWYU pragma: keep

Sts1CobcSw/Serial/Serial.hpp

@@ -14,6 +14,7 @@
 
 
 #include <Sts1CobcSw/Serial/Byte.hpp>
+#include <Sts1CobcSw/Serial/Serial.hpp>
 
 // We need std::byteswap which is C++23 but for some reason clang-tidy crashes when using C++23, so
 // we use the ETL version
@@ -24,6 +25,7 @@
 #include <cstddef>
 #include <cstring>
 #include <span>
+#include <tuple>
 #include <type_traits>
 
 

Sts1CobcSw/Utility/Crc32.cpp

@@ -1,16 +1,16 @@
 #include <Sts1CobcSw/Serial/Byte.hpp>
 #include <Sts1CobcSw/Utility/Crc32.hpp>
 
+#include <stm32f4xx.h>
 #include <stm32f4xx_crc.h>
 #include <stm32f4xx_dma.h>
 #include <stm32f4xx_rcc.h>
 
-#include <rodos_no_using_namespace.h>
-
 #include <array>
-#include <bit>
 #include <climits>
+#include <cstddef>
 #include <cstring>
+#include <type_traits>
 
 
 namespace sts1cobcsw::utility

Sts1CobcSw/Utility/Time.hpp

@@ -23,4 +23,4 @@ auto PrintFormattedSystemUtc() -> void;
 }
 
 
-#include <Sts1CobcSw/Utility/Time.ipp>
+#include <Sts1CobcSw/Utility/Time.ipp>  // IWYU pragma: keep

iwyu.imp

@@ -41,8 +41,38 @@
   # Include support libs we use by their full path
   { include: ["<ringbuffer.h>", "private", "<rodos/support/support-libs/ringbuffer.h>", "public"] },
 
-  { include: ["\"Sts1CobcwSw/Hal/Spi.ipp\"", "private", "\"Sts1CobcwSw/Hal/Spi.hpp\"", "public"] },
-  { include: ["\"Sts1CobcwSw/Hal/GpioPin.ipp\"", "private", "\"Sts1CobcwSw/Hal/GpioPin.hpp\"", "public"] },
-  { include: ["\"Sts1CobcwSw/Utility/Time.ipp\"", "private", "\"Sts1CobcwSw/Utility/Time.hpp\"", "public"] }
+  { include: ["\"Sts1CobcSw/FileSystem/FileSystem.ipp\"", "private", "<Sts1CobcSw/FileSystem/FileSystem.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/Spi.ipp\"",               "private", "<Sts1CobcSw/Hal/Spi.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/GpioPin.ipp\"",           "private", "<Sts1CobcSw/Hal/GpioPin.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Utility/Time.ipp\"",          "private", "<Sts1CobcSw/Utility/Time.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Periphery/Fram.ipp\"",        "private", "<Sts1CobcSw/Periphery/Fram.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Serial/Byte.ipp\"",           "private", "<Sts1CobcSw/Serial/Byte.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Serial/Serial.ipp\"",         "private", "<Sts1CobcSw/Serial/Serial.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Utility/Span.ipp\"",          "private", "<Sts1CobcSw/Utility/Span.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Edu/Structs.ipp\"",           "private", "<Sts1CobcSw/Edu/Structs.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/Uart.ipp\"",              "private", "<Sts1CobcSw/Hal/Uart.hpp>", "public"] },
+
+  { include: ["\"Sts1CobcSw/FileSystem/FileSystem.ipp\"", "private", "<Sts1CobcSw/FileSystem/FileSystem.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/Spi.ipp\"",               "private", "<Sts1CobcSw/Hal/Spi.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/GpioPin.ipp\"",           "private", "<Sts1CobcSw/Hal/GpioPin.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Utility/Time.ipp\"",          "private", "<Sts1CobcSw/Utility/Time.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Periphery/Fram.ipp\"",        "private", "<Sts1CobcSw/Periphery/Fram.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Serial/Byte.ipp\"",           "private", "<Sts1CobcSw/Serial/Byte.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Serial/Serial.ipp\"",         "private", "<Sts1CobcSw/Serial/Serial.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Utility/Span.ipp\"",          "private", "<Sts1CobcSw/Utility/Span.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Edu/Structs.ipp\"",           "private", "<Sts1CobcSw/Edu/Structs.ipp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/Uart.ipp\"",              "private", "<Sts1CobcSw/Hal/Uart.ipp>", "public"] },
+
+  { include: ["\"Sts1CobcSw/FileSystem/FileSystem.hpp\"", "public", "<Sts1CobcSw/FileSystem/FileSystem.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/Spi.hpp\"",               "public", "<Sts1CobcSw/Hal/Spi.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/GpioPin.hpp\"",           "public", "<Sts1CobcSw/Hal/GpioPin.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Utility/Time.hpp\"",          "public", "<Sts1CobcSw/Utility/Time.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Periphery/Fram.hpp\"",        "public", "<Sts1CobcSw/Periphery/Fram.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Serial/Byte.hpp\"",           "public", "<Sts1CobcSw/Serial/Byte.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Serial/Serial.hpp\"",         "public", "<Sts1CobcwSw/Serial/Serial.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Utility/Span.hpp\"",          "public", "<Sts1CobcSw/Utility/Span.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Edu/Structs.hpp\"",           "public", "<Sts1CobcSw/Edu/Structs.hpp>", "public"] },
+  { include: ["\"Sts1CobcSw/Hal/Uart.hpp\"",              "public", "<Sts1CobcSw/Hal/Uart.hpp>", "public"] }
+
 
 ]