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

all fixed slot sequence improvenements #24

Merged
gaisser merged 13 commits from KSat/fsfw:mueller_FixedSequenceImprovements into master 2020-07-02 14:28:54 +02:00
Conversation 4 Commits 13 Files Changed 5 +121 -92
muellerr commented 2020-04-06 11:26:33 +02:00
Owner
Copy Link

This fixes #46 .
This fixes #23 .

Including:

  • Using std::multiset instead of std::list. I still think this
    is a nice feature. It allows PST insertion in ANY order. This is convenient when the PST is not generated automatically. The < operator was overloaded for the FixedSequenceSlot to allow this, it was tested and it works
  • Form stuff, consistent documentation
  • freeRTOS throws sanity error and exits if time is 0. for now, i set ms to 1 for that case, but maybe its better to print a warning and exit()
This fixes #46 . This fixes #23 . Including: - Using std::multiset instead of std::list. I still think this is a nice feature. It allows PST insertion in ANY order. This is convenient when the PST is not generated automatically. The < operator was overloaded for the FixedSequenceSlot to allow this, it was tested and it works - Form stuff, consistent documentation - freeRTOS throws sanity error and exits if time is 0. for now, i set ms to 1 for that case, but maybe its better to print a warning and exit()
gaisser was assigned by mohr 2020-04-20 14:35:50 +02:00
muellerr added the
feature
 label 2020-04-30 22:01:50 +02:00
gaisser commented 2020-05-07 16:44:46 +02:00
Owner
Copy Link

This pull request must merge the master branch again to avoid conflicts.

This pull request must merge the master branch again to avoid conflicts.
muellerr commented 2020-05-07 20:12:37 +02:00
Author
Owner
Copy Link

I updated the branch. There were not any functional changes, so everything should work. However, I had to comment out all DHB related objects in my devel branch of the mission because they are already using the refactored DHB stuff which prevents me from doing immediate testing. maybe I'll write some unit tests to show that everything is working as intended.

I updated the branch. There were not any functional changes, so everything should work. However, I had to comment out all DHB related objects in my devel branch of the mission because they are already using the refactored DHB stuff which prevents me from doing immediate testing. maybe I'll write some unit tests to show that everything is working as intended.
gaisser reviewed 2020-05-11 16:36:04 +02:00
osal/FreeRTOS/FixedTimeslotTask.h Outdated
@ -51,6 +51,7 @@ public:
ReturnValue_t checkSequence() const;
ReturnValue_t sleepFor(uint32_t ms);
gaisser commented 2020-05-11 16:36:04 +02:00
Owner
Copy Link

I think this can be removed from the pull request

I think this can be removed from the pull request
muellerr commented 2020-05-11 17:16:42 +02:00
Author
Owner
Copy Link

merge upstream master

merge upstream master
gaisser reviewed 2020-06-23 20:12:47 +02:00
devicehandlers/FixedSlotSequence.h Outdated
@ -6,1 +6,3 @@
#include <list>
#include <set>
using SlotList = std::multiset<FixedSequenceSlot>;
gaisser commented 2020-06-23 20:12:47 +02:00
Owner
Copy Link

This is in global namespace or?

This is in global namespace or?
muellerr commented 2020-06-24 11:58:36 +02:00
Author
Owner
Copy Link

Yes, maybe it woould be better to put it in the class..

Yes, maybe it woould be better to put it in the class..
gaisser added the
API Change
 label 2020-06-25 14:34:15 +02:00
gaisser commented 2020-06-25 14:36:08 +02:00
Owner
Copy Link

Ok to me it looks good now.

Ok to me it looks good now.
gaisser closed this pull request 2020-07-02 14:28:54 +02:00
gaisser deleted branch mueller_FixedSequenceImprovements 2020-07-02 14:29:00 +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#24
No description provided.
Delete Branch "KSat/fsfw:mueller_FixedSequenceImprovements"

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?