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

power update #295

Merged
gaisser merged 6 commits from KSat/fsfw:mueller/power-update into development 2020-12-10 16:59:52 +01:00
Conversation 2 Commits 6 Files Changed 10 +152 -129
muellerr commented 2020-12-03 18:30:22 +01:00
Owner
Copy Link

power uses new local data pools now.

power uses new local data pools now.
muellerr added the
feature
API Change
 labels 2020-12-03 18:30:22 +01:00
muellerr added 1 commit 2020-12-03 18:30:23 +01:00
muellerr added 1 commit 2020-12-03 18:30:30 +01:00
gaisser added this to the ASTP 1.0.0 Local pools milestone 2020-12-03 18:36:03 +01:00
muellerr added 1 commit 2020-12-05 11:51:16 +01:00
muellerr added 1 commit 2020-12-10 16:46:45 +01:00
gaisser reviewed 2020-12-10 16:56:04 +01:00
power/Fuse.h Outdated
@ -3,1 +1,4 @@
#ifndef FSFW_POWER_FUSE_H_
#define FSFW_POWER_FUSE_H_
<<<<<<< HEAD
gaisser commented 2020-12-10 16:56:04 +01:00
Owner
Copy Link

Merge conflict not resolved

Merge conflict not resolved
gaisser marked this conversation as resolved
gaisser reviewed 2020-12-10 16:56:19 +01:00
power/Fuse.h Outdated
@ -85,12 +94,26 @@ private:
};
PowerMonitor powerMonitor;
<<<<<<< HEAD
gaisser commented 2020-12-10 16:56:19 +01:00
Owner
Copy Link

Again

Again
gaisser marked this conversation as resolved
gaisser self-assigned this 2020-12-10 16:57:15 +01:00
muellerr added 1 commit 2020-12-10 16:57:55 +01:00
gaisser added 1 commit 2020-12-10 16:59:45 +01:00
gaisser merged commit 18f90ef2fc into development 2020-12-10 16:59:52 +01:00
gaisser deleted branch mueller/power-update 2020-12-10 16:59:56 +01: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
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#295
No description provided.
Delete Branch "KSat/fsfw:mueller/power-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?