|
|
0ea044c203
|
Merge pull request 'Update from upstream' (#85) from mueller/update-from-upstream into develop
Reviewed-on: #85
|
2022-05-16 22:08:28 +02:00 |
|
|
|
4b323053ec
|
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream
|
2022-05-16 15:27:58 +02:00 |
|
|
|
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 |
|
|
|
ef9d7aa7d3
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-16 14:42:23 +02:00 |
|
|
|
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 |
|
|
|
878e32cbe8
|
Merge branch 'development' into mueller/add-tc-scheduler-pus-11
|
2022-05-16 14:29:02 +02:00 |
|
|
|
4821706561
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-16 14:16:53 +02:00 |
|
|
|
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 |
|
|
|
4841d5d92d
|
doc update
|
2022-05-13 17:24:55 +02:00 |
|
|
|
5736023ffa
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-13 17:22:57 +02:00 |
|
|
|
ac78a79ca2
|
Merge pull request 'Command Executor Improvements' (#83) from mueller/cmd-executer-improvements into develop
Reviewed-on: #83
|
2022-05-13 14:57:18 +02:00 |
|
|
|
bf7388c059
|
Merge pull request 'HealthIF extensions and upstream updates' (#82) from mueller/health-if-extension-eive into develop
Reviewed-on: #82
|
2022-05-13 14:56:50 +02:00 |
|
|
|
e98aa005cb
|
Merge branch 'development' into mueller/power-switcher-component-upstream
|
2022-05-13 13:25:13 +02:00 |
|
|
|
52310f7d32
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-05-13 13:24:26 +02:00 |
|
|
|
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 |
|
|
|
970f039e85
|
Merge remote-tracking branch 'origin/development' into mueller/extend-version-class
|
2022-05-13 13:21:01 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
13a34cd677
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-05-13 11:58:41 +02:00 |
|
|
|
811287aac8
|
delete old scripts
|
2022-05-13 11:57:22 +02:00 |
|
|
|
23fb06578b
|
this is better
|
2022-05-13 11:56:37 +02:00 |
|
|
|
c86e99e6dc
|
rename auto-formatter
|
2022-05-13 11:56:20 +02:00 |
|
|
|
4092de911c
|
use variable for repeated section
|
2022-05-13 11:55:19 +02:00 |
|
|
|
00952e15b0
|
Merge branch 'development' into mueller/missing-preproc-defs
|
2022-05-13 11:50:24 +02:00 |
|
|
|
01ebf0f4d3
|
tab size
|
2022-05-13 11:49:01 +02:00 |
|
|
|
99fe6487c8
|
another small improvement
|
2022-05-13 11:48:18 +02:00 |
|
|
|
d4a6f987bc
|
small fix
|
2022-05-13 11:46:59 +02:00 |
|
|
|
57bac4f262
|
Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists
|
2022-05-13 11:46:17 +02:00 |
|
|
|
cfa6843c8f
|
check whether clang-format is installed
|
2022-05-13 11:46:04 +02:00 |
|
|
|
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 |
|
|
|
deee4c43c0
|
finally this works
|
2022-05-13 11:37:58 +02:00 |
|
|
|
ad0b6f1ed1
|
another small fix
|
2022-05-13 11:35:59 +02:00 |
|
|
|
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 |
|
|
|
9e3d5b6a0c
|
small fix
|
2022-05-13 11:35:18 +02:00 |
|
|
|
994c7299b9
|
add cmake-format command to shell script
|
2022-05-13 11:34:44 +02:00 |
|
|
|
57a830cb46
|
Merge branch 'development' into mueller/amft-cmakelists
|
2022-05-13 11:30:52 +02:00 |
|
|
|
271057ca6b
|
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
|
2022-05-13 11:28:54 +02:00 |
|
|
|
c2de911efa
|
Merge branch 'develop' into mueller/cmd-executer-improvements
|
2022-05-13 11:22:53 +02:00 |
|
|
|
861335212e
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-05-13 00:30:18 +02:00 |
|
|
|
038e47a46e
|
better returncode handling
|
2022-05-13 00:30:01 +02:00 |
|
|
|
c215508a12
|
another missing preproc guard
|
2022-05-13 00:25:52 +02:00 |
|
|
|
ccadbb5942
|
Merge branch 'development' into mueller/missing-preproc-defs
|
2022-05-13 00:24:04 +02:00 |
|
|
|
fc2b709148
|
resolve merge conflict
|
2022-05-12 20:48:50 +02:00 |
|
|
|
02473a0cd7
|
Merge remote-tracking branch 'origin/develop' into mueller/health-if-extension-eive
|
2022-05-12 20:11:45 +02:00 |
|
|
|
ab45aa1296
|
HasHealthIF additions
|
2022-05-12 20:06:10 +02:00 |
|
|
|
171c48495c
|
Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream
|
2022-05-12 19:07:12 +02:00 |
|
|
|
a83b86ccd2
|
Merge pull request 'refactor power module' (#590) from eive/fsfw:mueller/refactor-power-switch-if-etc into development
Reviewed-on: fsfw/fsfw#590
|
2022-05-12 18:37:45 +02:00 |
|
|
|
3046822e88
|
run cmake-format
|
2022-05-12 17:27:39 +02:00 |
|
|
|
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 |
|
|
|
9b6fa646ed
|
Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists
|
2022-05-12 17:16:10 +02:00 |
|
