mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

fixing merge again

Browse Source
This commit is contained in:
Ulrich Mohr 2023-06-02 12:08:06 +02:00
parent 1f4ad10dff
commit c1a9678abb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fsfw/osal/linux/Clock.cpp
View File

@ -47,8 +47,8 @@ timeval Clock::getUptime() {
return uptime;
}
if (ifile >> uptimeSeconds) {
uptime->tv_sec = uptimeSeconds;
uptime->tv_usec = uptimeSeconds * (double)1e6 - (uptime->tv_sec * 1e6);
uptime.tv_sec = uptimeSeconds;
uptime.tv_usec = (uptimeSeconds - uptime.tv_sec) * (double)1e6;
}
return uptime;
}