esbo_ds/fsfw
3
0
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

removed conflict markers

Browse Source
This commit is contained in:
Robin Müller 2020-05-15 21:14:21 +02:00
parent abdf04ce79
commit ebcc4742a9
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osal/FreeRTOS/FixedTimeslotTask.cpp
View File

@ -57,10 +57,6 @@ ReturnValue_t FixedTimeslotTask::startTask() {
ReturnValue_t FixedTimeslotTask::addSlot(object_id_t componentId, ReturnValue_t FixedTimeslotTask::addSlot(object_id_t componentId,
uint32_t slotTimeMs, int8_t executionStep) { uint32_t slotTimeMs, int8_t executionStep) {
<<<<<<< HEAD
=======
>>>>>>> mueller_framework
if (objectManager->get<ExecutableObjectIF>(componentId) != nullptr) { if (objectManager->get<ExecutableObjectIF>(componentId) != nullptr) {
if(slotTimeMs == 0) { if(slotTimeMs == 0) {
// FreeRTOS throws a sanity error for zero values, so we set // FreeRTOS throws a sanity error for zero values, so we set