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

controller base update #290

Merged
gaisser merged 6 commits from KSat/fsfw:mueller/controller-update into development 2020-12-10 16:42:45 +01:00
Conversation 1 Commits 6 Files Changed 2 +70 -55
muellerr commented 2020-12-03 13:16:22 +01:00
Owner
Copy Link

Some updates from the SOURCE fork to make those folder identical

Some updates from the SOURCE fork to make those folder identical
muellerr added the feature label 2020-12-03 13:16:22 +01:00
muellerr added 1 commit 2020-12-03 13:16:22 +01:00
controller base update 795ff585f8
muellerr added 1 commit 2020-12-03 13:16:27 +01:00
Merge branch 'development' into mueller/controller-update ffcbc11351
gaisser added this to the ASTP 1.0.0 Local pools milestone 2020-12-03 18:20:50 +01:00
gaisser added 1 commit 2020-12-08 14:46:20 +01:00
Merge branch 'development' into mueller/controller-update 6f474daae0
gaisser reviewed 2020-12-08 14:48:54 +01:00
controller/ControllerBase.h Outdated
@@ -55,3 +72,4 @@
HealthHelper healthHelper;
// Is this still needed?
gaisser commented 2020-12-08 14:48:54 +01:00
Owner
Copy Link

This is not a question for the code but one to the developer of the local pools. ;)

This is not a question for the code but one to the developer of the local pools. ;)
muellerr marked this conversation as resolved
gaisser self-assigned this 2020-12-08 14:49:04 +01:00
muellerr added 1 commit 2020-12-08 15:42:58 +01:00
Merge remote-tracking branch 'upstream/development' into mueller/controller-update b0053c3b77
muellerr added 1 commit 2020-12-08 15:44:08 +01:00
removed hk switcher helper member ac5446b2b1
gaisser added 1 commit 2020-12-10 16:42:32 +01:00
Merge branch 'development' into mueller/controller-update d412e4ff5d
gaisser merged commit 3dafdc9071 into development 2020-12-10 16:42:45 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
gaisser
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 feature
Milestone
No items
No Milestone ASTP 1.0.0 Local pools
Assignees
Clear assignees
ahinkel dwoodward gaisser hanke jenkins_buildfix lrajer meierj mohr muellerr taheran tbaumgartl
No Assignees gaisser
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: fsfw/fsfw#290
Delete Branch "KSat/fsfw:mueller/controller-update"

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?