Update from upstream #85

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

91 Commits

Author SHA1 Message Date
Robin Müller 4b323053ec
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-05-16 15:27:58 +02:00
Robin Müller f0debecbbc Merge pull request 'Extend version handling and class' (#601) from eive/fsfw:mueller/extend-version-class into development
Reviewed-on: fsfw/fsfw#601
2022-05-16 14:52:15 +02:00
Robin Müller ef9d7aa7d3 Merge branch 'development' into mueller/extend-version-class 2022-05-16 14:42:23 +02:00
Robin Müller b8fd2db434 Merge pull request 'Add PUS TC scheduler service' (#594) from KSat/fsfw:mueller/add-tc-scheduler-pus-11 into development
Reviewed-on: fsfw/fsfw#594
2022-05-16 14:32:19 +02:00
Robin Müller 878e32cbe8 Merge branch 'development' into mueller/add-tc-scheduler-pus-11 2022-05-16 14:29:02 +02:00
Robin Müller 4821706561 Merge branch 'development' into mueller/extend-version-class 2022-05-16 14:16:53 +02:00
Robin Müller eed6a64597 Merge pull request 'Power Switcher Component' (#596) from eive/fsfw:mueller/power-switcher-component-upstream into development
Reviewed-on: fsfw/fsfw#596
2022-05-13 22:42:23 +02:00
Robin Müller 5736023ffa Merge branch 'development' into mueller/extend-version-class 2022-05-13 17:22:57 +02:00
Robin Müller e98aa005cb Merge branch 'development' into mueller/power-switcher-component-upstream 2022-05-13 13:25:13 +02:00
Robin Müller 52310f7d32
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-13 13:24:26 +02:00
Robin Müller e3d1308205 Merge pull request 'preproc guards' (#612) from eive/fsfw:mueller/missing-preproc-defs into development
Reviewed-on: fsfw/fsfw#612
2022-05-13 13:22:38 +02:00
Robin Müller 970f039e85
Merge remote-tracking branch 'origin/development' into mueller/extend-version-class 2022-05-13 13:21:01 +02:00
Steffen Gaisser 99c72fd00b Merge pull request 'Auto-Formatter Script Improvements' (#626) from mueller/amft-cmakelists into development
Reviewed-on: fsfw/fsfw#626
2022-05-13 12:01:40 +02:00
Robin Müller 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 2022-05-13 11:58:45 +02:00
Robin Müller 13a34cd677
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-13 11:58:41 +02:00
Robin Müller 811287aac8
delete old scripts 2022-05-13 11:57:22 +02:00
Robin Müller 23fb06578b
this is better 2022-05-13 11:56:37 +02:00
Robin Müller c86e99e6dc
rename auto-formatter 2022-05-13 11:56:20 +02:00
Robin Müller 4092de911c
use variable for repeated section 2022-05-13 11:55:19 +02:00
Robin Müller 00952e15b0 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-13 11:50:24 +02:00
Robin Müller 01ebf0f4d3
tab size 2022-05-13 11:49:01 +02:00
Robin Müller 99fe6487c8
another small improvement 2022-05-13 11:48:18 +02:00
Robin Müller d4a6f987bc
small fix 2022-05-13 11:46:59 +02:00
Robin Müller 57bac4f262 Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 2022-05-13 11:46:17 +02:00
Robin Müller cfa6843c8f
check whether clang-format is installed 2022-05-13 11:46:04 +02:00
Steffen Gaisser b6b3221b22 Merge pull request 'run auto-formatter over cmakelists.txt' (#619) from mueller/amft-cmakelists into development
Reviewed-on: fsfw/fsfw#619
2022-05-13 11:44:48 +02:00
Robin Müller deee4c43c0
finally this works 2022-05-13 11:37:58 +02:00
Robin Müller ad0b6f1ed1
another small fix 2022-05-13 11:35:59 +02:00
Robin Müller ec03a674bd Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists 2022-05-13 11:35:28 +02:00
Robin Müller 9e3d5b6a0c
small fix 2022-05-13 11:35:18 +02:00
Robin Müller 994c7299b9
add cmake-format command to shell script 2022-05-13 11:34:44 +02:00
Robin Müller 57a830cb46 Merge branch 'development' into mueller/amft-cmakelists 2022-05-13 11:30:52 +02:00
Robin Müller 271057ca6b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-13 11:28:54 +02:00
Robin Müller 861335212e Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-13 00:30:18 +02:00
Robin Müller 038e47a46e
better returncode handling 2022-05-13 00:30:01 +02:00
Robin Müller c215508a12
another missing preproc guard 2022-05-13 00:25:52 +02:00
Robin Müller ccadbb5942 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-13 00:24:04 +02:00
Robin Müller 171c48495c Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream 2022-05-12 19:07:12 +02:00
Robin Müller 3046822e88
run cmake-format 2022-05-12 17:27:39 +02:00
Robin Müller 6442dd0c38 Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists 2022-05-12 17:16:15 +02:00
Robin Müller 9b6fa646ed
Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 2022-05-12 17:16:10 +02:00
Robin Müller e77bde459b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-12 17:12:26 +02:00
Robin Müller 2d9d83a1c5 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-12 17:10:54 +02:00
Robin Müller 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 2022-05-12 17:06:12 +02:00
Robin Müller b8cfb36426
added additional explicit returnvalues 2022-05-12 17:05:58 +02:00
Robin Müller e5c140e0ae Merge branch 'development' into mueller/add-tc-scheduler-pus-11 2022-05-12 16:59:01 +02:00
Robin Müller c4c340fde1
lot of refactoring 2022-05-12 16:56:06 +02:00
Robin Müller 9a4c7589cc Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-12 15:52:47 +02:00
Robin Müller 34e124f2db Merge branch 'development' into mueller/amft-cmakelists 2022-05-11 11:30:40 +02:00
Robin Müller 377c3325d2
update cmake-modules file 2022-05-10 12:16:38 +02:00
Robin Müller efb3d982f3
added missing prefix 2022-05-10 11:52:40 +02:00
Robin Müller dd986fefd3
experimenting with PRE_BUILD command 2022-05-10 11:51:25 +02:00
Robin Müller b38329aa0e Merge branch 'development' into mueller/extend-version-class 2022-05-10 11:19:48 +02:00
Robin Müller 458aa5c265 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-10 09:56:29 +02:00
Robin Müller be6a492022 Merge branch 'development' into mueller/extend-version-class 2022-05-09 22:34:09 +02:00
Robin Müller d8bd08dd8c Merge branch 'development' into mueller/amft-cmakelists 2022-05-09 17:22:40 +02:00
Robin Müller 18c2847b08 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-09 17:21:48 +02:00
Steffen Gaisser d983305ea5 Merge branch 'development' into mueller/amft-cmakelists 2022-05-09 16:34:22 +02:00
Robin Müller 5989c88c88 indentation 2022-05-09 15:54:29 +02:00
Robin Müller da8a108cb7 Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 2022-05-09 15:54:10 +02:00
Robin Müller eb494707af Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream 2022-05-09 15:51:28 +02:00
Robin Müller 736f8d0238 order fix 2022-05-09 15:50:49 +02:00
Robin Müller f1acf8e18b Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-09 15:48:04 +02:00
Robin Müller 4015e85506 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-09 15:35:49 +02:00
Robin Müller 220469a2dd Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 2022-05-09 15:16:12 +02:00
Robin Müller 6308427d03
run auto-formatter over cmakelists.txt 2022-05-09 11:18:56 +02:00
Robin Müller 398d04dc50
fixed tests 2022-05-09 11:15:18 +02:00
Robin Müller 80a5ed3c5b
added back fsfw namespace 2022-05-09 11:06:45 +02:00
Robin Müller 5d5a355110 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-09 11:04:15 +02:00
Robin Müller 2fbf847367 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-02 16:16:33 +02:00
Robin Müller 57e6c46e72 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-02 15:16:37 +02:00
Robin Müller a3617cad11
preproc guards 2022-05-02 15:12:38 +02:00
Robin Müller b62c19a364 Merge branch 'development' into mueller/extend-version-class 2022-05-02 14:48:23 +02:00
Robin Müller 8e4ad10627 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-27 08:46:18 +02:00
Robin Müller 496bc665d6 Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-27 08:45:47 +02:00
Robin Müller d62ee6a611 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-25 15:23:46 +02:00
Robin Mueller 91ef4ff30b Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-25 15:23:15 +02:00
Robin Müller 4032228005
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-25 15:15:54 +02:00
Robin Müller 50ce13d596 Merge branch 'development' into mueller/power-switcher-component-upstream 2022-04-25 15:14:38 +02:00
Robin Mueller 68302e7c5e
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-25 15:14:13 +02:00
Robin Mueller 35f257800e Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-12 17:10:55 +02:00
Robin Mueller 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 2022-04-11 16:17:05 +02:00
Robin Mueller a18bc15cbb
update changelog 2022-04-11 16:16:56 +02:00
Robin Müller 7af1c86f1c
use default call 2022-04-11 16:10:17 +02:00
Robin Müller bd0b7aa230 Merge branch 'mueller/power-switcher-component-upstream' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/power-switcher-component-upstream 2022-04-11 16:09:32 +02:00
Robin Müller 72e0938f9a
use size instead of capacity on sanity check 2022-04-11 16:09:15 +02:00
Robin Müller dd1b0a9380 Merge branch 'development' into mueller/power-switcher-component-upstream 2022-04-11 16:08:27 +02:00
Robin Müller 4dee913d51 Merge branch 'development' into mueller/add-tc-scheduler-pus-11 2022-04-04 14:19:25 +02:00
Robin Müller c7daf697a8
add new power switcher component 2022-04-01 17:27:53 +02:00
Robin Müller 82fc7f33a8
update afmt scripts to format *.tpp files 2022-03-29 15:11:41 +02:00
Robin Müller bfa77cf810
Add TC scheduler service
- Written by David Woodward as part of the SOURCE project
- Adaptions to make it more generic and compatible to FSFW
2022-03-29 15:07:29 +02:00