Add TimeTypes.[hi]pp again

We actually do need this to break the cyclic dependency between `RealTime.hpp` and `FramLayout.hpp`.
SpaceTeam · Sep 22, 2024 · 0cbbeb6 · 0cbbeb6
1 parent bd67eba
commit 0cbbeb6
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 67 deletions.
diff --git a/Sts1CobcSw/Utility/RealTime.hpp b/Sts1CobcSw/Utility/RealTime.hpp
@@ -2,7 +2,7 @@
 
 
 #include <Sts1CobcSw/Serial/Serial.hpp>
-#include <Sts1CobcSw/Utility/RodosTime.hpp>
+#include <Sts1CobcSw/Utility/TimeTypes.hpp>
 
 #include <strong_type/affine_point.hpp>
 #include <strong_type/difference.hpp>
@@ -17,26 +17,9 @@
 
 namespace sts1cobcsw
 {
-using RealTime = strong::type<std::int32_t,
-                              struct RealTimeTag,
-                              strong::default_constructible,
-                              strong::equality,
-                              strong::strongly_ordered>;
-
-
-template<>
-inline constexpr std::size_t serialSize<RealTime> =
-    totalSerialSize<strong::underlying_type_t<RealTime>>;
-
-
 [[nodiscard]] auto CurrentRealTime() -> RealTime;
 [[nodiscard]] auto ToRodosTime(RealTime realTime) -> RodosTime;
 [[nodiscard]] auto ToRealTime(RodosTime rodosTime) -> RealTime;
-
-template<std::endian endianness>
-[[nodiscard]] auto SerializeTo(void * destination, RealTime const & data) -> void *;
-template<std::endian endianness>
-[[nodiscard]] auto DeserializeFrom(void const * source, RealTime * data) -> void const *;
 }
 
 

diff --git a/Sts1CobcSw/Utility/RealTime.ipp b/Sts1CobcSw/Utility/RealTime.ipp
@@ -4,6 +4,8 @@
 #include <Sts1CobcSw/FramSections/FramLayout.hpp>
 #include <Sts1CobcSw/Utility/RealTime.hpp>
 
+#include <rodos/api/timemodel.h>
+
 
 namespace sts1cobcsw
 {
@@ -25,19 +27,4 @@ inline auto ToRealTime(RodosTime rodosTime) -> RealTime
     return RealTime(value_of(rodosTime + persistentVariables.template Load<"realTimeOffset">())
                     / RODOS::SECONDS);
 }
-
-
-template<std::endian endianness>
-inline auto SerializeTo(void * destination, RealTime const & data) -> void *
-{
-    return SerializeTo<endianness>(destination, value_of(data));
-}
-
-
-template<std::endian endianness>
-inline auto DeserializeFrom(void const * source, RealTime * data) -> void const *
-{
-    source = DeserializeFrom<endianness>(source, &(value_of(*data)));
-    return source;
-}
 }
diff --git a/Sts1CobcSw/Utility/RodosTime.hpp b/Sts1CobcSw/Utility/RodosTime.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
+
 #include <Sts1CobcSw/Serial/Serial.hpp>
+#include <Sts1CobcSw/Utility/TimeTypes.hpp>
 
 #include <strong_type/affine_point.hpp>
 #include <strong_type/difference.hpp>
@@ -17,16 +19,6 @@
 
 namespace sts1cobcsw
 {
-using Duration = strong::
-    type<std::int64_t, struct DurationTag, strong::difference, strong::default_constructible>;
-using RodosTime = strong::type<std::int64_t,
-                               struct RodosTimeTag,
-                               strong::affine_point<Duration>,
-                               strong::default_constructible,
-                               strong::equality,
-                               strong::strongly_ordered>;
-
-
 // NOLINTBEGIN(readability-identifier-length)
 constexpr auto s = Duration(RODOS::SECONDS);
 constexpr auto ms = Duration(RODOS::MILLISECONDS);
@@ -39,19 +31,10 @@ constexpr auto days = Duration(RODOS::DAYS);
 constexpr auto weeks = Duration(RODOS::WEEKS);
 constexpr auto endOfTime = RodosTime(RODOS::END_OF_TIME);
 
-template<>
-inline constexpr std::size_t serialSize<Duration> =
-    totalSerialSize<strong::underlying_type_t<Duration>>;
-
 
 [[nodiscard]] auto CurrentRodosTime() -> RodosTime;
 auto SuspendUntil(RodosTime time) -> void;
 auto SuspendFor(Duration duration) -> void;
-
-template<std::endian endianness>
-[[nodiscard]] auto SerializeTo(void * destination, Duration const & data) -> void *;
-template<std::endian endianness>
-[[nodiscard]] auto DeserializeFrom(void const * source, Duration * data) -> void const *;
 }
 
 

diff --git a/Sts1CobcSw/Utility/RodosTime.ipp b/Sts1CobcSw/Utility/RodosTime.ipp
@@ -22,19 +22,4 @@ inline auto SuspendFor(Duration duration) -> void
 {
     RODOS::AT(RODOS::NOW() + value_of(duration));
 }
-
-
-template<std::endian endianness>
-inline auto SerializeTo(void * destination, Duration const & data) -> void *
-{
-    return SerializeTo<endianness>(destination, value_of(data));
-}
-
-
-template<std::endian endianness>
-inline auto DeserializeFrom(void const * source, Duration * data) -> void const *
-{
-    source = DeserializeFrom<endianness>(source, &(value_of(*data)));
-    return source;
-}
 }
diff --git a/Sts1CobcSw/Utility/TimeTypes.hpp b/Sts1CobcSw/Utility/TimeTypes.hpp
@@ -0,0 +1,53 @@
+#pragma once
+
+
+#include <Sts1CobcSw/Serial/Serial.hpp>
+
+#include <strong_type/affine_point.hpp>
+#include <strong_type/difference.hpp>
+#include <strong_type/equality.hpp>
+#include <strong_type/ordered.hpp>
+#include <strong_type/type.hpp>
+
+#include <bit>
+#include <cstddef>
+#include <cstdint>
+
+
+namespace sts1cobcsw
+{
+using Duration = strong::
+    type<std::int64_t, struct DurationTag, strong::difference, strong::default_constructible>;
+using RodosTime = strong::type<std::int64_t,
+                               struct RodosTimeTag,
+                               strong::affine_point<Duration>,
+                               strong::default_constructible,
+                               strong::equality,
+                               strong::strongly_ordered>;
+using RealTime = strong::type<std::int32_t,
+                              struct RealTimeTag,
+                              strong::default_constructible,
+                              strong::equality,
+                              strong::strongly_ordered>;
+
+
+template<>
+inline constexpr std::size_t serialSize<RealTime> =
+    totalSerialSize<strong::underlying_type_t<RealTime>>;
+template<>
+inline constexpr std::size_t serialSize<Duration> =
+    totalSerialSize<strong::underlying_type_t<Duration>>;
+
+
+template<std::endian endianness>
+[[nodiscard]] auto SerializeTo(void * destination, RealTime const & data) -> void *;
+template<std::endian endianness>
+[[nodiscard]] auto DeserializeFrom(void const * source, RealTime * data) -> void const *;
+template<std::endian endianness>
+[[nodiscard]] auto SerializeTo(void * destination, Duration const & data) -> void *;
+template<std::endian endianness>
+[[nodiscard]] auto DeserializeFrom(void const * source, Duration * data) -> void const *;
+}
+
+
+#include <Sts1CobcSw/Utility/TimeTypes.ipp>  // IWYU pragma: keep
diff --git a/Sts1CobcSw/Utility/TimeTypes.ipp b/Sts1CobcSw/Utility/TimeTypes.ipp
@@ -0,0 +1,37 @@
+#pragma once
+
+
+#include <Sts1CobcSw/Utility/TimeTypes.hpp>
+
+
+namespace sts1cobcsw
+{
+template<std::endian endianness>
+inline auto SerializeTo(void * destination, RealTime const & data) -> void *
+{
+    return SerializeTo<endianness>(destination, value_of(data));
+}
+
+
+template<std::endian endianness>
+inline auto DeserializeFrom(void const * source, RealTime * data) -> void const *
+{
+    source = DeserializeFrom<endianness>(source, &(value_of(*data)));
+    return source;
+}
+
+
+template<std::endian endianness>
+inline auto SerializeTo(void * destination, Duration const & data) -> void *
+{
+    return SerializeTo<endianness>(destination, value_of(data));
+}
+
+
+template<std::endian endianness>
+inline auto DeserializeFrom(void const * source, Duration * data) -> void const *
+{
+    source = DeserializeFrom<endianness>(source, &(value_of(*data)));
+    return source;
+}
+}