Rename UpdateTimeData.timestamp to UpdateTimeData.currentTime

SpaceTeam · Dec 10, 2023 · f7ce5b2 · f7ce5b2
1 parent 9455b35
commit f7ce5b2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/Sts1CobcSw/Edu/Edu.cpp b/Sts1CobcSw/Edu/Edu.cpp
@@ -537,14 +537,14 @@ auto ReturnResultCommunication() -> ResultInfo
 //! Update Time:
 //! -> [DATA]
 //! -> [Command Header]
-//! -> [Timestamp]
+//! -> [Current Time]
 //! <- [N/ACK]
 //! <- [N/ACK]
 //!
 //! The first N/ACK confirms a valid data packet,
 //! the second N/ACK confirms the time update.
 //!
-//! @param timestamp A unix timestamp
+//! @param currentTime A unix timestamp
 //!
 //! @returns A relevant error code
 auto UpdateTime(UpdateTimeData const & data) -> ErrorCode

diff --git a/Sts1CobcSw/Edu/EduMock.cpp b/Sts1CobcSw/Edu/EduMock.cpp
@@ -98,7 +98,7 @@ auto GetStatus() -> Status
 auto UpdateTime(UpdateTimeData const & data) -> ErrorCode
 {
     PrintFormattedSystemUtc();
-    PRINTF("Call to UpdateTime(timestamp = %" PRIi32 ")\n", data.timestamp);
+    PRINTF("Call to UpdateTime(currentTime = %" PRIi32 ")\n", data.currentTime);
     return ErrorCode::success;
 }
 

diff --git a/Sts1CobcSw/Edu/Structs.hpp b/Sts1CobcSw/Edu/Structs.hpp
@@ -46,7 +46,7 @@ struct ExecuteProgramData
 struct UpdateTimeData
 {
     static constexpr auto id = updateTimeId;
-    std::int32_t timestamp;
+    std::int32_t currentTime;
 };
 
 
@@ -112,7 +112,7 @@ inline constexpr std::size_t serialSize<edu::ExecuteProgramData> =
 
 template<>
 inline constexpr std::size_t serialSize<edu::UpdateTimeData> =
-    totalSerialSize<decltype(edu::UpdateTimeData::id), decltype(edu::UpdateTimeData::timestamp)>;
+    totalSerialSize<decltype(edu::UpdateTimeData::id), decltype(edu::UpdateTimeData::currentTime)>;
 
 
 namespace edu

diff --git a/Sts1CobcSw/Edu/Structs.ipp b/Sts1CobcSw/Edu/Structs.ipp
@@ -62,7 +62,7 @@ template<std::endian endianness>
 auto SerializeTo(void * destination, UpdateTimeData const & data) -> void *
 {
     destination = SerializeTo<endianness>(destination, UpdateTimeData::id);
-    destination = SerializeTo<endianness>(destination, data.timestamp);
+    destination = SerializeTo<endianness>(destination, data.currentTime);
     return destination;
 }
 }
diff --git a/Sts1CobcSw/EduProgramQueueThread.cpp b/Sts1CobcSw/EduProgramQueueThread.cpp
@@ -94,7 +94,7 @@ class EduProgramQueueThread : public RODOS::StaticThread<stackSize>
             utility::PrintFormattedSystemUtc();
 
             auto errorCode =
-                edu::UpdateTime(edu::UpdateTimeData{.timestamp = utility::GetUnixUtc()});
+                edu::UpdateTime(edu::UpdateTimeData{.currentTime = utility::GetUnixUtc()});
             if(errorCode != edu::ErrorCode::success)
             {
                 RODOS::PRINTF("UpdateTime error code : %d\n", static_cast<int>(errorCode));

diff --git a/Tests/HardwareTests/EduCommandTests/EduCommands.test.cpp b/Tests/HardwareTests/EduCommandTests/EduCommands.test.cpp
@@ -61,9 +61,9 @@ class EduCommandsTest : public RODOS::StaticThread<>
             {
                 case 'u':
                 {
-                    auto timestamp = utility::GetUnixUtc();
-                    PRINTF("Sending UpdateTime(timestamp = %d)\n", static_cast<int>(timestamp));
-                    auto errorCode = edu::UpdateTime({.timestamp = timestamp});
+                    auto currentTime = utility::GetUnixUtc();
+                    PRINTF("Sending UpdateTime(currentTime = %d)\n", static_cast<int>(currentTime));
+                    auto errorCode = edu::UpdateTime({.currentTime = currentTime});
                     PRINTF("Returned error code: %d\n", static_cast<int>(errorCode));
                     break;
                 }