Update from upstream #85
muellerr
commented 2022-05-16 15:30:21 +02:00
Owner
- This also adds the TC scheduler service
- This also adds the TC scheduler service
muellerr
added 91 commits 2022-05-16 15:30:23 +02:00
bfa77cf810
Add TC scheduler service
82fc7f33a8
update afmt scripts to format *.tpp files
c7daf697a8
add new power switcher component
4dee913d51
Merge branch 'development' into mueller/add-tc-scheduler-pus-11
dd1b0a9380
Merge branch 'development' into mueller/power-switcher-component-upstream
72e0938f9a
use size instead of capacity on sanity check
bd0b7aa230
Merge branch 'mueller/power-switcher-component-upstream' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/power-switcher-component-upstream
7af1c86f1c
use default call
a18bc15cbb
update changelog
d0b7c22afc
Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11
35f257800e
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
68302e7c5e
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
50ce13d596
Merge branch 'development' into mueller/power-switcher-component-upstream
4032228005
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
91ef4ff30b
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
d62ee6a611
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
496bc665d6
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
8e4ad10627
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
b62c19a364
Merge branch 'development' into mueller/extend-version-class
a3617cad11
preproc guards
57e6c46e72
Merge branch 'development' into mueller/missing-preproc-defs
2fbf847367
Merge branch 'development' into mueller/missing-preproc-defs
5d5a355110
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
80a5ed3c5b
added back fsfw namespace
398d04dc50
fixed tests
6308427d03
run auto-formatter over cmakelists.txt
220469a2dd
Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists
4015e85506
Merge branch 'development' into mueller/missing-preproc-defs
f1acf8e18b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
736f8d0238
order fix
eb494707af
Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream
da8a108cb7
Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists
5989c88c88
indentation
d983305ea5
Merge branch 'development' into mueller/amft-cmakelists
18c2847b08
Merge branch 'development' into mueller/missing-preproc-defs
d8bd08dd8c
Merge branch 'development' into mueller/amft-cmakelists
be6a492022
Merge branch 'development' into mueller/extend-version-class
458aa5c265
Merge branch 'development' into mueller/missing-preproc-defs
b38329aa0e
Merge branch 'development' into mueller/extend-version-class
dd986fefd3
experimenting with PRE_BUILD command
efb3d982f3
added missing prefix
377c3325d2
update cmake-modules file
34e124f2db
Merge branch 'development' into mueller/amft-cmakelists
9a4c7589cc
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
c4c340fde1
lot of refactoring
e5c140e0ae
Merge branch 'development' into mueller/add-tc-scheduler-pus-11
b8cfb36426
added additional explicit returnvalues
70d4fc1e0a
Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11
2d9d83a1c5
Merge branch 'development' into mueller/missing-preproc-defs
e77bde459b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
9b6fa646ed
Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists
6442dd0c38
Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists
3046822e88
run cmake-format
171c48495c
Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream
ccadbb5942
Merge branch 'development' into mueller/missing-preproc-defs
c215508a12
another missing preproc guard
038e47a46e
better returncode handling
861335212e
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
271057ca6b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
57a830cb46
Merge branch 'development' into mueller/amft-cmakelists
994c7299b9
add cmake-format command to shell script
9e3d5b6a0c
small fix
ec03a674bd
Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists
ad0b6f1ed1
another small fix
deee4c43c0
finally this works
b6b3221b22
Merge pull request 'run auto-formatter over cmakelists.txt' (#619) from mueller/amft-cmakelists into development
cfa6843c8f
check whether clang-format is installed
57bac4f262
Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists
d4a6f987bc
small fix
99fe6487c8
another small improvement
01ebf0f4d3
tab size
00952e15b0
Merge branch 'development' into mueller/missing-preproc-defs
4092de911c
use variable for repeated section
c86e99e6dc
rename auto-formatter
23fb06578b
this is better
811287aac8
delete old scripts
13a34cd677
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
5a4539def4
Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11
99c72fd00b
Merge pull request 'Auto-Formatter Script Improvements' (#626) from mueller/amft-cmakelists into development
970f039e85
Merge remote-tracking branch 'origin/development' into mueller/extend-version-class
e3d1308205
Merge pull request 'preproc guards' (#612) from eive/fsfw:mueller/missing-preproc-defs into development
52310f7d32
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
e98aa005cb
Merge branch 'development' into mueller/power-switcher-component-upstream
5736023ffa
Merge branch 'development' into mueller/extend-version-class
eed6a64597
Merge pull request 'Power Switcher Component' (#596) from eive/fsfw:mueller/power-switcher-component-upstream into development
4821706561
Merge branch 'development' into mueller/extend-version-class
878e32cbe8
Merge branch 'development' into mueller/add-tc-scheduler-pus-11
b8fd2db434
Merge pull request 'Add PUS TC scheduler service' (#594) from KSat/fsfw:mueller/add-tc-scheduler-pus-11 into development
ef9d7aa7d3
Merge branch 'development' into mueller/extend-version-class
f0debecbbc
Merge pull request 'Extend version handling and class' (#601) from eive/fsfw:mueller/extend-version-class into development
4b323053ec
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream
muellerr
requested review from meierj 2022-05-16 15:30:28 +02:00
meierj
approved these changes 2022-05-16 22:08:22 +02:00
meierj
merged commit 0ea044c203 into develop 2022-05-16 22:08:28 +02:00
meierj
referenced this issue from a commit 2022-05-16 22:08:29 +02:00
Merge pull request 'Update from upstream' (#85) from mueller/update-from-upstream into develop
muellerr
deleted branch mueller/update-from-upstream 2022-05-17 09:58:15 +02:00
No reviewers
Labels
No Label
api change
breaking api change
bug
documentation
duplicate
feature
help wanted
invalid
question
wontfix
No Milestone
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: eive/fsfw#85
Loading…
Reference in New Issue
No description provided.
Delete Branch "mueller/update-from-upstream"
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?