fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

WIP: develop_update #706

Draft
muellerr wants to merge 710 commits from eive/fsfw:develop_update into development
pull from: eive/fsfw:develop_update
merge into: fsfw:development
Conversation 0 Commits 710 Files Changed 187 +5 -9
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c80a3752d9 - Show all commits

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

@ -100,9 +100,7 @@ ReturnValue_t Clock::getClock(timeval* time) {
#endif
}
ReturnValue_t Clock::getClock_timeval(timeval* time) {
return Clock::getClock(time);
}
ReturnValue_t Clock::getClock_timeval(timeval* time) { return Clock::getClock(time); }
ReturnValue_t Clock::getClock_usecs(uint64_t* time) {
if (time == nullptr) {

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

@ -53,9 +53,7 @@ ReturnValue_t Clock::getClock(timeval *time) {
return returnvalue::OK;
}
ReturnValue_t Clock::getClock_timeval(timeval* time) {
return Clock::getClock(time);
}
ReturnValue_t Clock::getClock_timeval(timeval* time) { return Clock::getClock(time); }
ReturnValue_t Clock::getClock_usecs(uint64_t* time) {
timeval timeVal{};