|
|
9f7dad31eb
|
Merge branch 'master' into mueller/FixedTimeslotUpdate
|
2020-09-29 14:21:02 +02:00 |
|
|
|
21cbb19410
|
Merge pull request 'ipc update' (#176) from KSat/fsfw:mueller/ipc-updates into master
Reviewed-on: fsfw/fsfw#176
|
2020-09-29 14:20:18 +02:00 |
|
|
|
170217e2e8
|
Merge branch 'master' into mueller/ipc-updates
|
2020-09-29 14:15:13 +02:00 |
|
|
|
291a62eeb9
|
Merge branch 'master' into gaisser_small_map_issues
|
2020-09-29 14:14:48 +02:00 |
|
|
|
945f49bbe9
|
Merge pull request 'Object Id and Verif Reporter Improvements' (#213) from KSat/fsfw:mueller/objectIdImprovement into master
User have to change instantiation to the objectId of the new PUS Services
Reviewed-on: fsfw/fsfw#213
|
2020-09-29 14:14:27 +02:00 |
|
|
|
183b6a4193
|
small bugfix
|
2020-09-29 13:34:27 +02:00 |
|
|
|
6d2266f7d0
|
equalization complete
|
2020-09-26 14:58:53 +02:00 |
|
|
|
9d4c2b90f3
|
removed proxy/ not used&working?
|
2020-09-26 14:54:23 +02:00 |
|
|
|
7b57f372bf
|
starting convergence
|
2020-09-26 14:51:00 +02:00 |
|
|
|
496251bd68
|
Merge branch 'master' into mueller/ipc-updates
|
2020-09-26 14:21:05 +02:00 |
|
|
|
22d9b77165
|
added documentation
|
2020-09-26 14:19:51 +02:00 |
|
|
|
40558835c7
|
Merge branch 'master' into mueller/FixedTimeslotUpdate
|
2020-09-26 14:14:50 +02:00 |
|
|
|
4d1492f130
|
event cfg file loc not explicit anymore
|
2020-09-26 14:13:20 +02:00 |
|
|
|
c24c0ea575
|
Merge branch 'master' into mueller/oldPoolRenaming
|
2020-09-26 14:04:41 +02:00 |
|
|
|
842c21684a
|
Merge branch 'master' into gaisser_small_map_issues
|
2020-09-22 18:37:51 +02:00 |
|
|
|
d1fb512c1f
|
Merge pull request 'Small fix with new pus services' (#210) from gaisser/fsfw:gaisser_small_fix_subsystem_id into master
Reviewed-on: fsfw/fsfw#210
|
2020-09-22 17:10:09 +02:00 |
|
|
|
59f72d1031
|
Small fix with new pus services
|
2020-09-22 16:59:13 +02:00 |
|
|
|
74a4c98ca7
|
Small format stuff
|
2020-09-22 16:23:35 +02:00 |
|
|
|
d0f912f32b
|
Merge branch 'master' into mueller/FixedTimeslotUpdate
|
2020-09-22 16:20:07 +02:00 |
|
|
|
b681a76f29
|
Merge branch 'master' into gaisser_small_map_issues
|
2020-09-22 16:18:55 +02:00 |
|
|
|
ed80768c66
|
Fixes #194
|
2020-09-22 16:13:45 +02:00 |
|
|
|
59e4b95b62
|
Merge pull request 'srv17 id added, include fix for linux' (#206) from KSat/fsfw:mueller/include_fix_srv17_id into master
Reviewed-on: fsfw/fsfw#206
|
2020-09-22 16:03:23 +02:00 |
|
|
|
ab0f4d8c87
|
service 9 ID added
|
2020-09-22 16:01:34 +02:00 |
|
|
|
98333b92ef
|
srv17 id added, include fix for linux
|
2020-09-22 15:57:26 +02:00 |
|
|
|
74b9aef36b
|
freeRTOS update
|
2020-09-22 15:33:28 +02:00 |
|
|
|
7dc3a7ecbd
|
fix so it compiles
|
2020-09-22 15:31:15 +02:00 |
|
|
|
4248e4000c
|
Merge branch 'mueller/ipc-updates' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/ipc-updates
|
2020-09-22 15:29:38 +02:00 |
|
|
|
b2777faf66
|
queueue factory update
|
2020-09-22 15:29:28 +02:00 |
|
|
|
9faa8d3896
|
Merge branch 'master' into mueller/ipc-updates
|
2020-09-22 15:25:58 +02:00 |
|
|
|
d57b329630
|
Merge branch 'master' into mueller/oldPoolRenaming
|
2020-09-22 15:24:09 +02:00 |
|
|
|
8f2c8c838e
|
Merge branch 'master' into mueller/FixedTimeslotUpdate
|
2020-09-22 15:24:07 +02:00 |
|
|
|
66383f78c6
|
Merge pull request 'renormalized files' (#201) from KSat/fsfw:mueller/file_renormalization into master
Reviewed-on: fsfw/fsfw#201
|
2020-09-22 15:22:34 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
