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

Merge remote-tracking branch 'upstram/master' into mueller_PeriodicTaskImprovements

Browse Source
This commit is contained in:
Robin Müller
2020-07-06 12:40:27 +02:00
parent 19cbac923f 3cd946fef8
commit 856f1efd6b
19 changed files with 1112 additions and 796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osal/FreeRTOS/FixedTimeslotTask.cpp
View File

@ -82,10 +82,10 @@ ReturnValue_t FixedTimeslotTask::checkSequence() const {
void FixedTimeslotTask::taskFunctionality() {
// A local iterator for the Polling Sequence Table is created to find the start time for the first entry.
std::list<FixedSequenceSlot*>::iterator it = pst.current;
auto slotListIter = pst.current;
//The start time for the first entry is read.
uint32_t intervalMs = (*it)->pollingTimeMs;
uint32_t intervalMs = slotListIter->pollingTimeMs;
TickType_t interval = pdMS_TO_TICKS(intervalMs);
TickType_t xLastWakeTime;
@ -120,4 +120,3 @@ ReturnValue_t FixedTimeslotTask::sleepFor(uint32_t ms) {
vTaskDelay(pdMS_TO_TICKS(ms));
return HasReturnvaluesIF::RETURN_OK;
}

4
osal/FreeRTOS/FixedTimeslotTask.h
View File

@ -5,8 +5,10 @@
#include <framework/tasks/FixedTimeslotTaskIF.h>
#include <framework/tasks/Typedef.h>
#include <FreeRTOS.h>
extern "C" {
#include "FreeRTOS.h"
#include "task.h"
}
class FixedTimeslotTask: public FixedTimeslotTaskIF {
public: