eive/fsfw
eive/fsfw
14
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

implement relative timeshift #173

Merged
muellerr merged 10 commits from time-service-relative-timeshift into develop 2024-04-09 13:31:13 +02:00
Conversation 1 Commits 10 Files Changed 3 +5 -3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aff6bb673b - Show all commits

4
src/fsfw/pus/Service9TimeManagement.cpp
View File

@ -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;
muellerr marked this conversation as resolved Outdated
meggert commented 2024-04-08 09:01:06 +02:00
Outdated
Review
Copy Link

my man refusing to use 1e-9 so that one has to count the 0 individually

my man refusing to use 1e-9 so that one has to count the 0 individually
muellerr commented 2024-04-08 10:21:44 +02:00
Outdated
Review
Copy Link

Isn't that a float/double implicitely? WE are using C++17 anyway, we can just use 1'000'000'000 I guess

Isn't that a float/double implicitely? WE are using C++17 anyway, we can just use 1'000'000'000 I guess
meggert commented 2024-04-08 10:22:41 +02:00
Outdated
Review
Copy Link

1e9 is what i meant

1e9 is what i meant
offset.tv_usec = (std::abs(timeshiftNanos) % NANOS_PER_SECOND) / 1000;
timeval newTime;
if (positiveShift) {

4
src/fsfw/pus/Service9TimeManagement.h
View File

@ -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);