From f8e3777c43c3d3a44487d11472294f285958a684 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 3 Apr 2024 16:23:21 +0200
Subject: [PATCH] more fixes

---
 src/fsfw/pus/Service9TimeManagement.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/fsfw/pus/Service9TimeManagement.cpp b/src/fsfw/pus/Service9TimeManagement.cpp
index 8804fa25..5d8462c6 100644
--- a/src/fsfw/pus/Service9TimeManagement.cpp
+++ b/src/fsfw/pus/Service9TimeManagement.cpp
@@ -27,9 +27,7 @@ ReturnValue_t Service9TimeManagement::handleRequest(uint8_t subservice) {
       if (result != returnvalue::OK) {
         return result;
       }
-      uint32_t subsecondMs =
-          static_cast<uint32_t>(std::floor(static_cast<double>(newTime.tv_usec) / 1000.0));
-      triggerEvent(CLOCK_DUMP, newTime.tv_sec, subsecondMs);
+      triggerEvent(CLOCK_DUMP, newTime.tv_sec, newTime.tv_usec);
       return returnvalue::OK;
     }
     case Subservice::RELATIVE_TIMESHIFT: {
@@ -63,7 +61,12 @@ ReturnValue_t Service9TimeManagement::handleRequest(uint8_t subservice) {
       } else {
         newTime = currentTime - offset;
       }
-      return Clock::setClock(&newTime);
+      result = Clock::setClock(&newTime);
+      if (result == returnvalue::OK) {
+        // Report new time as event.
+        triggerEvent(CLOCK_DUMP, newTime.tv_sec, newTime.tv_usec);
+      }
+      return result;
     }
     default:
       return AcceptsTelecommandsIF::INVALID_SUBSERVICE;