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

Merge branch 'mueller_sifRenaming_soooMany' into mueller_framework

Browse Source
This commit is contained in:
Robin Müller
2020-04-23 19:21:12 +02:00
parent 1415cd2339 2c6b446500
commit 01195093e3
36 changed files with 117 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osal/FreeRTOS/FixedTimeslotTask.cpp
View File

@ -32,14 +32,14 @@ void FixedTimeslotTask::taskEntryPoint(void* argument) {
}
originalTask->taskFunctionality();
debug << "Polling task " << originalTask->handle
sif::debug << "Polling task " << originalTask->handle
<< " returned from taskFunctionality." << std::endl;
}
void FixedTimeslotTask::missedDeadlineCounter() {
FixedTimeslotTask::deadlineMissedCount++;
if (FixedTimeslotTask::deadlineMissedCount % 10 == 0) {
error << "PST missed " << FixedTimeslotTask::deadlineMissedCount
sif::error << "PST missed " << FixedTimeslotTask::deadlineMissedCount
<< " deadlines." << std::endl;
}
}

2
osal/FreeRTOS/MessageQueue.cpp
View File

@ -9,7 +9,7 @@ MessageQueue::MessageQueue(size_t message_depth, size_t max_message_size) :
defaultDestination(0),lastPartner(0), callContext(CallContext::task) {
handle = xQueueCreate(message_depth, max_message_size);
if (handle == NULL) {
error << "MessageQueue creation failed" << std::endl;
sif::error << "MessageQueue creation failed" << std::endl;
}
}

5
osal/FreeRTOS/PeriodicTask.cpp
View File

@ -10,7 +10,8 @@ PeriodicTask::PeriodicTask(const char *name, TaskPriority setPriority,
BaseType_t status = xTaskCreate(taskEntryPoint, name, setStack, this, setPriority, &handle);
if(status != pdPASS){
debug << "PeriodicTask Insufficient heap memory remaining. Status: " << status << std::endl;
sif::debug << "PeriodicTask Insufficient heap memory remaining. Status: "
<< status << std::endl;
}
}
@ -34,7 +35,7 @@ void PeriodicTask::taskEntryPoint(void* argument) {
}
originalTask->taskFunctionality();
debug << "Polling task " << originalTask->handle
sif::debug << "Polling task " << originalTask->handle
<< " returned from taskFunctionality." << std::endl;
}