From 4fc06a1eaf2eeb67ce59f45a03317ad230aff474 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 30 Jun 2023 15:20:25 +0200 Subject: [PATCH] fixes for SOURCE --- src/fsfw/osal/freertos/Clock.cpp | 5 +++++ src/fsfw/osal/freertos/TaskFactory.cpp | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/fsfw/osal/freertos/Clock.cpp b/src/fsfw/osal/freertos/Clock.cpp index dc00ac7e..35735011 100644 --- a/src/fsfw/osal/freertos/Clock.cpp +++ b/src/fsfw/osal/freertos/Clock.cpp @@ -44,6 +44,11 @@ ReturnValue_t Clock::getClock_timeval(timeval* time) { return returnvalue::OK; } +ReturnValue_t Clock::getClockMonotonic(timeval* time) { + // TODO: I don't actually know if the timekeeper is monotonic.. + return getClock_timeval(time); +} + ReturnValue_t Clock::getUptime(timeval* uptime) { *uptime = getUptime(); diff --git a/src/fsfw/osal/freertos/TaskFactory.cpp b/src/fsfw/osal/freertos/TaskFactory.cpp index 688069cf..28698ee3 100644 --- a/src/fsfw/osal/freertos/TaskFactory.cpp +++ b/src/fsfw/osal/freertos/TaskFactory.cpp @@ -10,9 +10,10 @@ TaskFactory::~TaskFactory() {} TaskFactory* TaskFactory::instance() { return TaskFactory::factoryInstance; } -PeriodicTaskIF* TaskFactory::createPeriodicTask( - TaskName name_, TaskPriority taskPriority_, TaskStackSize stackSize_, TaskPeriod period_, - TaskDeadlineMissedFunction deadLineMissedFunction_) { +PeriodicTaskIF* TaskFactory::createPeriodicTask(TaskName name_, TaskPriority taskPriority_, + TaskStackSize stackSize_, TaskPeriod period_, + TaskDeadlineMissedFunction deadLineMissedFunction_, + void* args) { return dynamic_cast( new PeriodicTask(name_, taskPriority_, stackSize_, period_, deadLineMissedFunction_)); } @@ -22,7 +23,7 @@ PeriodicTaskIF* TaskFactory::createPeriodicTask( */ FixedTimeslotTaskIF* TaskFactory::createFixedTimeslotTask( TaskName name_, TaskPriority taskPriority_, TaskStackSize stackSize_, TaskPeriod period_, - TaskDeadlineMissedFunction deadLineMissedFunction_) { + TaskDeadlineMissedFunction deadLineMissedFunction_, void* args) { return dynamic_cast( new FixedTimeslotTask(name_, taskPriority_, stackSize_, period_, deadLineMissedFunction_)); }