From 8c87dafd5d6f3a8d544970e83c36d157d3bc89b4 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 17 Apr 2024 20:56:07 +0200 Subject: [PATCH] FreeRTOS clock fix --- src/fsfw/osal/freertos/Clock.cpp | 4 +++- src/fsfw_hal/linux/serial/helper.cpp | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/fsfw/osal/freertos/Clock.cpp b/src/fsfw/osal/freertos/Clock.cpp index 35735011..59ccc109 100644 --- a/src/fsfw/osal/freertos/Clock.cpp +++ b/src/fsfw/osal/freertos/Clock.cpp @@ -34,7 +34,9 @@ ReturnValue_t Clock::setClock(const timeval* time) { return returnvalue::OK; } -ReturnValue_t Clock::getClock_timeval(timeval* time) { +ReturnValue_t Clock::getClock_timeval(timeval* time) { return getClock(time); } + +ReturnValue_t Clock::getClock(timeval* time) { timeval uptime = getUptime(); timeval offset = Timekeeper::instance()->getOffset(); diff --git a/src/fsfw_hal/linux/serial/helper.cpp b/src/fsfw_hal/linux/serial/helper.cpp index 3a0dbb7a..2b444fe8 100644 --- a/src/fsfw_hal/linux/serial/helper.cpp +++ b/src/fsfw_hal/linux/serial/helper.cpp @@ -168,4 +168,3 @@ void serial::flushRxBuf(int fd) { tcflush(fd, TCIFLUSH); } void serial::flushTxBuf(int fd) { tcflush(fd, TCOFLUSH); } void serial::flushTxRxBuf(int fd) { tcflush(fd, TCIOFLUSH); } -