KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

EIVE upstream #29

Merged
muellerr merged 693 commits from use-eive-upstream into develop 2023-06-30 15:44:39 +02:00
Conversation 0 Commits 693 Files Changed 188 +10 -4
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4fc06a1eaf - Show all commits

5
src/fsfw/osal/freertos/Clock.cpp
View File

@ -44,6 +44,11 @@ ReturnValue_t Clock::getClock_timeval(timeval* time) {
return returnvalue::OK; 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) { ReturnValue_t Clock::getUptime(timeval* uptime) {
*uptime = getUptime(); *uptime = getUptime();

9
src/fsfw/osal/freertos/TaskFactory.cpp
View File

@ -10,9 +10,10 @@ TaskFactory::~TaskFactory() {}
TaskFactory* TaskFactory::instance() { return TaskFactory::factoryInstance; } TaskFactory* TaskFactory::instance() { return TaskFactory::factoryInstance; }
PeriodicTaskIF* TaskFactory::createPeriodicTask( PeriodicTaskIF* TaskFactory::createPeriodicTask(TaskName name_, TaskPriority taskPriority_,
TaskName name_, TaskPriority taskPriority_, TaskStackSize stackSize_, TaskPeriod period_, TaskStackSize stackSize_, TaskPeriod period_,
TaskDeadlineMissedFunction deadLineMissedFunction_) { TaskDeadlineMissedFunction deadLineMissedFunction_,
void* args) {
return dynamic_cast<PeriodicTaskIF*>( return dynamic_cast<PeriodicTaskIF*>(
new PeriodicTask(name_, taskPriority_, stackSize_, period_, deadLineMissedFunction_)); new PeriodicTask(name_, taskPriority_, stackSize_, period_, deadLineMissedFunction_));
} }
@ -22,7 +23,7 @@ PeriodicTaskIF* TaskFactory::createPeriodicTask(
*/ */
FixedTimeslotTaskIF* TaskFactory::createFixedTimeslotTask( FixedTimeslotTaskIF* TaskFactory::createFixedTimeslotTask(
TaskName name_, TaskPriority taskPriority_, TaskStackSize stackSize_, TaskPeriod period_, TaskName name_, TaskPriority taskPriority_, TaskStackSize stackSize_, TaskPeriod period_,
TaskDeadlineMissedFunction deadLineMissedFunction_) { TaskDeadlineMissedFunction deadLineMissedFunction_, void* args) {
return dynamic_cast<FixedTimeslotTaskIF*>( return dynamic_cast<FixedTimeslotTaskIF*>(
new FixedTimeslotTask(name_, taskPriority_, stackSize_, period_, deadLineMissedFunction_)); new FixedTimeslotTask(name_, taskPriority_, stackSize_, period_, deadLineMissedFunction_));
} }