Update from upstream #85

Merged

meierj merged 91 commits from mueller/update-from-upstream into develop 2022-05-16 22:08:28 +02:00

Conversation 1 Commits 91 Files Changed 29

+1954 -919

muellerr commented 2022-05-16 15:30:21 +02:00

Owner

Copy link

Copy source

• 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

Add TC scheduler service ... bfa77cf810

- Written by David Woodward as part of the SOURCE project
- Adaptions to make it more generic and compatible to FSFW

update afmt scripts to format *.tpp files 82fc7f33a8

add new power switcher component c7daf697a8

Merge branch 'development' into mueller/add-tc-scheduler-pus-11 4dee913d51

Merge branch 'development' into mueller/power-switcher-component-upstream dd1b0a9380

use size instead of capacity on sanity check 72e0938f9a

Merge branch 'mueller/power-switcher-component-upstream' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/power-switcher-component-upstream bd0b7aa230

use default call 7af1c86f1c

update changelog a18bc15cbb

Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11 d0b7c22afc

Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 35f257800e

Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 68302e7c5e

Merge branch 'development' into mueller/power-switcher-component-upstream 50ce13d596

Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 4032228005

Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 91ef4ff30b

Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class d62ee6a611

Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 496bc665d6

Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 8e4ad10627

Merge branch 'development' into mueller/extend-version-class b62c19a364

preproc guards a3617cad11

Merge branch 'development' into mueller/missing-preproc-defs 57e6c46e72

Merge branch 'development' into mueller/missing-preproc-defs 2fbf847367

Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 5d5a355110

added back fsfw namespace 80a5ed3c5b

fixed tests 398d04dc50

run auto-formatter over cmakelists.txt 6308427d03

Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 220469a2dd

Merge branch 'development' into mueller/missing-preproc-defs 4015e85506

Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class f1acf8e18b

order fix 736f8d0238

Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream eb494707af

Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists da8a108cb7

indentation 5989c88c88

Merge branch 'development' into mueller/amft-cmakelists d983305ea5

Merge branch 'development' into mueller/missing-preproc-defs 18c2847b08

Merge branch 'development' into mueller/amft-cmakelists d8bd08dd8c

Merge branch 'development' into mueller/extend-version-class be6a492022

Merge branch 'development' into mueller/missing-preproc-defs 458aa5c265

Merge branch 'development' into mueller/extend-version-class b38329aa0e

experimenting with PRE_BUILD command dd986fefd3

added missing prefix efb3d982f3

update cmake-modules file 377c3325d2

Merge branch 'development' into mueller/amft-cmakelists 34e124f2db

Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 9a4c7589cc

lot of refactoring c4c340fde1

Merge branch 'development' into mueller/add-tc-scheduler-pus-11 e5c140e0ae

added additional explicit returnvalues b8cfb36426

Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11 70d4fc1e0a

Merge branch 'development' into mueller/missing-preproc-defs 2d9d83a1c5

Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class e77bde459b

Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 9b6fa646ed

Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists 6442dd0c38

run cmake-format 3046822e88

Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream 171c48495c

Merge branch 'development' into mueller/missing-preproc-defs ccadbb5942

another missing preproc guard c215508a12

better returncode handling 038e47a46e

Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 861335212e

Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 271057ca6b

Merge branch 'development' into mueller/amft-cmakelists 57a830cb46

add cmake-format command to shell script 994c7299b9

small fix 9e3d5b6a0c

Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists ec03a674bd

another small fix ad0b6f1ed1

finally this works deee4c43c0

Merge pull request 'run auto-formatter over cmakelists.txt' (#619) from mueller/amft-cmakelists into development ... b6b3221b22

Reviewed-on: fsfw/fsfw#619

check whether clang-format is installed cfa6843c8f

Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 57bac4f262

small fix d4a6f987bc

another small improvement 99fe6487c8

tab size 01ebf0f4d3

Merge branch 'development' into mueller/missing-preproc-defs 00952e15b0

use variable for repeated section 4092de911c

rename auto-formatter c86e99e6dc

this is better 23fb06578b

delete old scripts 811287aac8

Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 13a34cd677

Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11 5a4539def4

Merge pull request 'Auto-Formatter Script Improvements' (#626) from mueller/amft-cmakelists into development ... 99c72fd00b

Reviewed-on: fsfw/fsfw#626

Merge remote-tracking branch 'origin/development' into mueller/extend-version-class 970f039e85

Merge pull request 'preproc guards' (#612) from eive/fsfw:mueller/missing-preproc-defs into development ... e3d1308205

Reviewed-on: fsfw/fsfw#612

Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 52310f7d32

Merge branch 'development' into mueller/power-switcher-component-upstream e98aa005cb

Merge branch 'development' into mueller/extend-version-class 5736023ffa

Merge pull request 'Power Switcher Component' (#596) from eive/fsfw:mueller/power-switcher-component-upstream into development ... eed6a64597

Reviewed-on: fsfw/fsfw#596

Merge branch 'development' into mueller/extend-version-class 4821706561

Merge branch 'development' into mueller/add-tc-scheduler-pus-11 878e32cbe8

Merge pull request 'Add PUS TC scheduler service' (#594) from KSat/fsfw:mueller/add-tc-scheduler-pus-11 into development ... b8fd2db434

Reviewed-on: fsfw/fsfw#594

Merge branch 'development' into mueller/extend-version-class ef9d7aa7d3

Merge pull request 'Extend version handling and class' (#601) from eive/fsfw:mueller/extend-version-class into development ... f0debecbbc

Reviewed-on: fsfw/fsfw#601

Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 4b323053ec

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

Sign in to join this conversation.

Reviewers

No Reviewers

meierj

Labels

Clear labels

api change

API change

breaking api change

API change which can break existing code

bug

Something is not working

documentation

Documentation

duplicate

This issue or pull request already exists

feature

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No labels

Milestone

No items

No Milestone

Assignees

Clear assignees

ahinkel (Andy Hinkel) jenkins_buildfix lkoester meggert (Marius Eggert) meierj (Jakob Meier) mkoller mkranz mohr (Ulrich Mohr) msenger (Mikael Senger) muellerr (Robin Müller) rschweigert steinertm (Michael Steinert) zinkj

No Assignees

2 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: eive/fsfw#85