fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 32 Pull Requests 4 Releases 10 Wiki Activity

FixedTimeslotTask FreeRTOS improvements #117

Merged
gaisser merged 10 commits from KSat/fsfw:mueller_FixedTimeslotTaskImprovements into master 2020-07-14 11:45:41 +02:00
Conversation 4 Commits 10 Files Changed 2 +113 -70
muellerr commented 2020-06-19 14:51:56 +02:00
Owner
Copy Link

Added deadline missed check and updated doc.

Related to #118

Added deadline missed check and updated doc. Related to #118
muellerr added the
feature
 label 2020-06-19 14:51:56 +02:00
gaisser reviewed 2020-06-22 20:03:49 +02:00
osal/FreeRTOS/FixedTimeslotTask.cpp Outdated
@ -85,1 +88,3 @@
std::list<FixedSequenceSlot*>::iterator it = pst.current;
// A local iterator for the Polling Sequence Table is created to find the
// start time for the first entry.
SlotListIter slotListIter = pst.current;
gaisser commented 2020-06-22 20:03:49 +02:00
Owner
Copy Link

I can't find the Definition of SlotListIter at the moment. Is this a new typedef in this class or devicehandler/FixedSlotSequence.cpp?

I can't find the Definition of SlotListIter at the moment. Is this a new typedef in this class or devicehandler/FixedSlotSequence.cpp?
muellerr commented 2020-06-22 21:02:06 +02:00
Author
Owner
Copy Link

Oh, that is kind of annoying.. That is a new typedef in FixedSlotSequence.cpp/h which uses a multiset..
I pushed a new version which uses the list, but maybe it would be a better idea to merge the DHB changes and the FixedSlotSequence changes first..

Oh, that is kind of annoying.. That is a new typedef in FixedSlotSequence.cpp/h which uses a multiset.. I pushed a new version which uses the list, but maybe it would be a better idea to merge the DHB changes and the FixedSlotSequence changes first..
gaisser reviewed 2020-06-22 20:08:01 +02:00
osal/FreeRTOS/FixedTimeslotTask.h Outdated
@ -19,3 +15,1 @@
* @param (*setDeadlineMissedFunc)() The function pointer to the deadline missed function that shall be assigned.
*
* @param getPst The object id of the completely initialized polling sequence.
* Keep in Mind that you need to call before this vTaskStartScheduler()!
gaisser commented 2020-06-22 20:08:01 +02:00
Owner
Copy Link

Keep in Mind that you need to call before this vTaskStartScheduler() before this!

Keep in Mind that you need to call ~~before this~~ vTaskStartScheduler() before this!
gaisser reviewed 2020-06-22 20:36:11 +02:00
osal/FreeRTOS/FixedTimeslotTask.cpp Outdated
@ -116,0 +121,4 @@
this->deadlineMissedFunc();
}
// Continue immediately, no need to wait.
break;
gaisser commented 2020-06-22 20:36:11 +02:00
Owner
Copy Link

This does break the for loop. Are you sure that this is what you want?

This does break the for loop. Are you sure that this is what you want?
muellerr commented 2020-06-22 20:57:20 +02:00
Author
Owner
Copy Link

Youre right, continue is needed I think. This still needs to be tested anyway by setting an intentional delay in DHB.

Youre right, continue is needed I think. This still needs to be tested anyway by setting an intentional delay in DHB.
gaisser self-assigned this 2020-06-22 20:37:40 +02:00
muellerr changed title from FixedTimeslotTask FreeRTOS improvements to WIP:FixedTimeslotTask FreeRTOS improvements 2020-06-22 20:43:03 +02:00
muellerr changed title from WIP:FixedTimeslotTask FreeRTOS improvements to WIP: FixedTimeslotTask FreeRTOS improvements 2020-06-22 20:49:21 +02:00
muellerr commented 2020-06-22 21:04:28 +02:00
Author
Owner
Copy Link

It propably would be a good idea to merge this after the DHB changes and FixedSequenceSlot.cpp/.h .

It propably would be a good idea to merge this after the DHB changes and FixedSequenceSlot.cpp/.h .
gaisser commented 2020-06-22 21:33:31 +02:00
Owner
Copy Link

Ok I think, that this is not overflow safe. Compare that with the implementation in vTaskDelay of FreeRtos.

(xTaskGetTickCount() - xLastWakeTime >= pdMS_TO_TICKS(this->pst.getIntervalToPreviousSlotMs())
Ok I think, that this is not overflow safe. Compare that with the implementation in vTaskDelay of FreeRtos. ``` c++ (xTaskGetTickCount() - xLastWakeTime >= pdMS_TO_TICKS(this->pst.getIntervalToPreviousSlotMs()) ```
muellerr commented 2020-06-22 22:27:36 +02:00
Author
Owner
Copy Link

Hmm, how to best do this then? the check has to be performed twice? The FreeRTOs function can't return whether it has delayed or not..

Hmm, how to best do this then? the check has to be performed twice? The FreeRTOs function can't return whether it has delayed or not..
muellerr changed title from WIP: FixedTimeslotTask FreeRTOS improvements to FixedTimeslotTask FreeRTOS improvements 2020-07-06 12:37:46 +02:00
muellerr commented 2020-07-06 12:38:11 +02:00
Author
Owner
Copy Link

Deadline check has been implemented and pull request was adapted to the new underlying data structure multiset.

Deadline check has been implemented and pull request was adapted to the new underlying data structure multiset.
gaisser closed this pull request 2020-07-14 11:45:41 +02:00
gaisser deleted branch mueller_FixedTimeslotTaskImprovements 2020-07-14 11:45:46 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
API Change

Changes the API, so Users need to adapted

  
Breaking API Change

Changes the API in a non backwards compatible way

  
bug

Something is not working

  
build

Issues related to the buildsystem, including CI

  
cosmetics

Small change most users won't notice

  
Documentation

Improvement of code documentation

  
duplicate

This issue or pull request already exists

  
feature

New feature

  
help wanted

Need some help

  
hotfix

Quick or important fix that is merged directly into master, causing a new revision

  
invalid

#worksforme

  
question

More information is needed

  
Refactor

Contains a refactoring of some code

  
Tests

Issues related to testing code

  
wontfix

This won't be fixed

No Label
API Change
Breaking API Change
bug
build
cosmetics
Documentation
duplicate
feature
help wanted
hotfix
invalid
question
Refactor
Tests
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
gaisser
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: fsfw/fsfw#117
No description provided.
Delete Branch "KSat/fsfw:mueller_FixedTimeslotTaskImprovements"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?