From aff6bb673bb208ccd764770a3beb91a1250620e0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 8 Apr 2024 10:34:28 +0200 Subject: [PATCH] make marius the happies man alive --- src/fsfw/pus/Service9TimeManagement.cpp | 4 ++-- src/fsfw/pus/Service9TimeManagement.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/fsfw/pus/Service9TimeManagement.cpp b/src/fsfw/pus/Service9TimeManagement.cpp index 5d8462c6..004cf7d0 100644 --- a/src/fsfw/pus/Service9TimeManagement.cpp +++ b/src/fsfw/pus/Service9TimeManagement.cpp @@ -52,8 +52,8 @@ ReturnValue_t Service9TimeManagement::handleRequest(uint8_t subservice) { positiveShift = false; } timeval offset{}; - offset.tv_sec = std::abs(timeshiftNanos) / 1000000000; - offset.tv_usec = (std::abs(timeshiftNanos) % 1000000000) / 1000; + offset.tv_sec = std::abs(timeshiftNanos) / NANOS_PER_SECOND; + offset.tv_usec = (std::abs(timeshiftNanos) % NANOS_PER_SECOND) / 1000; timeval newTime; if (positiveShift) { diff --git a/src/fsfw/pus/Service9TimeManagement.h b/src/fsfw/pus/Service9TimeManagement.h index 508373ac..4170d615 100644 --- a/src/fsfw/pus/Service9TimeManagement.h +++ b/src/fsfw/pus/Service9TimeManagement.h @@ -7,9 +7,11 @@ class Service9TimeManagement : public PusServiceBase { public: static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PUS_SERVICE_9; + static constexpr uint32_t NANOS_PER_SECOND= 1'000'000'000; + //!< Clock has been set. P1: old timeval seconds. P2: new timeval seconds. static constexpr Event CLOCK_SET = MAKE_EVENT(0, severity::INFO); - //!< Clock dump event. P1: timeval seconds P2: timeval milliseconds. + //!< Clock dump event. P1: timeval seconds P2: timeval microseconds. static constexpr Event CLOCK_DUMP = MAKE_EVENT(1, severity::INFO); //!< Clock could not be set. P1: Returncode. static constexpr Event CLOCK_SET_FAILURE = MAKE_EVENT(2, severity::LOW);