Commit Graph

3043 Commits

Author SHA1 Message Date
522433e1b5 Merge branch 'mueller/file_renormalization' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/file_renormalization 2020-09-22 15:21:17 +02:00
156f44c268 Merge remote-tracking branch 'upstream/master' into mueller/file_renormalization 2020-09-22 15:21:12 +02:00
56c6f971e1 Merge branch 'master' into mueller/file_renormalization 2020-09-22 15:11:02 +02:00
33de6851eb Merge pull request 'SharedRingBuffer' (#167) from KSat/fsfw:mueller/sharedRingBufferPullRequest into master
Reviewed-on: fsfw/fsfw#167
2020-09-22 15:08:31 +02:00
f575c923d7 Merge branch 'master' into mueller/sharedRingBufferPullRequest 2020-09-22 15:08:06 +02:00
40d83fe603 Merge pull request 'SimpleRingBuffer Improvements' (#172) from KSat/fsfw:mueller/SimpleRingBufferUpdate2 into master
Reviewed-on: fsfw/fsfw#172
2020-09-22 15:07:34 +02:00
bb896faeb4 Merge branch 'master' into mueller/SimpleRingBufferUpdate2 2020-09-22 15:07:25 +02:00
3aa9ab2048 Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-22 15:06:14 +02:00
580669d49d Merge pull request 'object manager convergence' (#202) from KSat/fsfw:mueller/objectManager-convergence into master
Reviewed-on: fsfw/fsfw#202
2020-09-22 15:03:56 +02:00
90b3ebd390 Merge branch 'master' into mueller/objectManager-convergence 2020-09-22 15:00:51 +02:00
1791b5af57 Merge pull request 'Default Time Stamper' (#199) from KSat/fsfw:mueller/feature/timeStamper into master
Reviewed-on: fsfw/fsfw#199
2020-09-22 15:00:32 +02:00
108f897102 Merge branch 'master' into mueller/feature/timeStamper 2020-09-22 14:57:56 +02:00
9aaa5721af Merge pull request 'PUS Service 9' (#198) from KSat/fsfw:mueller/pusSrv9 into master
Reviewed-on: fsfw/fsfw#198
2020-09-22 14:56:38 +02:00
ade9c32ff3 Merge branch 'master' into mueller/pusSrv9 2020-09-22 14:56:21 +02:00
da4f6cf447 Merge pull request 'Stopwatch-Update' (#200) from KSat/fsfw:mueller/Stopwatch-Update into master
Reviewed-on: fsfw/fsfw#200
2020-09-22 14:56:06 +02:00
4587fbb76d srv9 func removed 2020-09-22 14:52:24 +02:00
af53bf6643 Merge branch 'master' into mueller/Stopwatch-Update 2020-09-22 14:52:20 +02:00
d8c5c4d85d Merge branch 'master' into mueller/pusSrv9 2020-09-22 14:49:39 +02:00
17583f605d Merge pull request 'PUS Service 17' (#197) from KSat/fsfw:mueller/pusSrv17 into master
Reviewed-on: fsfw/fsfw#197
2020-09-22 14:49:30 +02:00
5e974877fe Merge branch 'master' into mueller/pusSrv17 2020-09-22 14:34:05 +02:00
4074ca1b89 error code improved 2020-09-22 14:22:14 +02:00
447b69bf03 Merge branch 'master' into mueller/SimpleRingBufferUpdate2 2020-09-22 14:20:51 +02:00
37cf7566f9 Merge branch 'master' into mueller/sharedRingBufferPullRequest 2020-09-22 14:20:11 +02:00
0d8200e856 Merge pull request 'commanding service base hotfix' (#204) from KSat/fsfw:mueller/CSB-hotfix into master
Reviewed-on: fsfw/fsfw#204
2020-09-22 14:05:21 +02:00
7851a71a8e commanding service base hotfix 2020-09-22 14:00:18 +02:00
5072c09bc0 csb hotfix 2020-09-22 13:59:25 +02:00
e3cbc4dfd5 shared ring buffer extended 2020-09-22 02:12:02 +02:00
f5d793a1cf file system message getter func 2020-09-20 13:38:53 +02:00
763c52cfca CSB FIFO first steps to make configurable 2020-09-19 21:57:23 +02:00
40db85e73f separate messages for success/failure 2020-09-19 21:36:12 +02:00
cad08e1ea9 error output for failed deletion 2020-09-19 20:54:27 +02:00
e140d39944 some fixes for sd card handler 2020-09-19 20:08:25 +02:00
9e9bde0395 srv23 taken over 2020-09-19 19:50:02 +02:00
44989ada64 file system message taken over 2020-09-19 19:41:41 +02:00
718502c04b added additional flag which casn be used to disable
periodic handling
2020-09-19 17:15:33 +02:00
02f778ea1d new error code added 2020-09-19 17:14:09 +02:00
4ab7a08387 srv3 continued 2020-09-19 17:08:08 +02:00
32c0140cc2 hk stuff continued 2020-09-19 15:58:34 +02:00
9ecbc8199e added periodic helper 2020-09-19 02:46:29 +02:00
ba56f48e8e huge progress on hk + testing 2020-09-19 01:17:43 +02:00
757d2275ea internal bugfix 2020-09-18 15:06:14 +02:00
33e7cca23c several bugfixes amd improvements 2020-09-18 15:01:35 +02:00
5e3f40a2c1 changes taken over from pull request 2020-09-18 13:40:48 +02:00
721793a058 added author tag back 2020-09-18 13:38:53 +02:00
8ea0a38658 shoulddo fix 2020-09-18 13:37:38 +02:00
6062192bf0 dded back retval expalanation 2020-09-18 13:37:06 +02:00
85f21b0516 object manager convergence 2020-09-18 13:32:53 +02:00
3a043b5773 object manager tweaks complete 2020-09-18 13:31:51 +02:00
f50a80fc3c minor tweaks 2020-09-18 13:29:42 +02:00
4d4166071c added pus services to framework objects 2020-09-18 13:28:20 +02:00